From 9ff9b719bb3d016aa9f7be505170eea1e21bc74a Mon Sep 17 00:00:00 2001
From: "v-krishna.rao" <v-krishna.rao@oneplus.com>
Date: Wed, 29 Jul 2020 05:56:20 -0400
Subject: 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
-- 
cgit v1.2.3