summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-08-06 07:46:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-08-06 07:46:00 +0000
commitca1447d5ff9e3db75771813fe8137adbe1cc6330 (patch)
tree15f27c4bd412f3e520b43f755bddb68be70a8252 /service
parent3d21e9bec522725367443361d4a027280d66e5b0 (diff)
parent9ff9b719bb3d016aa9f7be505170eea1e21bc74a (diff)
Merge "Fix crash while calling getVendorInterface method observed during aging tests" into rvc-qpr-dev
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java b/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java
index 2d0886188..3d15ec647 100644
--- a/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java
+++ b/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java
@@ -307,7 +307,7 @@ public class SupplicantP2pIfaceHal {
}
supplicantIface.setResult(status, iface);
});
- } catch (RemoteException e) {
+ } catch (RemoteException | IllegalArgumentException e) {
Log.e(TAG, "ISupplicant.getInterface exception: " + e);
supplicantServiceDiedHandler();
return null;