commit 9ff9b719bb3d016aa9f7be505170eea1e21bc74a
author v-krishna.rao <v-krishna.rao@oneplus.com> Wed Jul 29 05:56:20 2020 -0400
committer David Su <dysu@google.com> Tue Aug 04 21:09:40 2020 +0000
tree d09e15cef765d2275424daa78a4af435e76effec
parent ece9f2221fcb68c1f18ab78966e7eb8f5049dfdd

Fix crash while calling getVendorInterface method observed during aging tests

IllegalArgumentException is possibly caused by issues in HIDL
(HwRemoteBinder), catch this exception to prevent crashing.

Bug: 162705230
Test: atest FrameworksWifiTests
Change-Id: I06fe85a4083db4dd9a8ce3a028e6d43646013673

service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java

diff --git a/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java b/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java
index 2d08861..3d15ec6 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 @@
                                 }
                                 supplicantIface.setResult(status, iface);
                             });
-                } catch (RemoteException e) {
+                } catch (RemoteException | IllegalArgumentException e) {
                     Log.e(TAG, "ISupplicant.getInterface exception: " + e);
                     supplicantServiceDiedHandler();
                     return null;