Merge "SupplicantStaIfaceHal: Don't trigger onDeath for remote exception" into pi-dev

1 files changed, 7 insertions, 14 deletions

diff --git a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
index 08a953e6f..5bf44ce66 100644
--- a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
+++ b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java
@@ -332,7 +332,7 @@ public class SupplicantStaIfaceHal {
                 });
             } catch (RemoteException e) {
                 Log.e(TAG, "ISupplicant.listInterfaces exception: " + e);
-                supplicantServiceDiedHandler(ifaceName);
+                handleRemoteException(e, "listInterfaces");
                 return null;
             }
             if (supplicantIfaces.size() == 0) {
@@ -353,7 +353,7 @@ public class SupplicantStaIfaceHal {
                                 });
                     } catch (RemoteException e) {
                         Log.e(TAG, "ISupplicant.getInterface exception: " + e);
-                        supplicantServiceDiedHandler(ifaceName);
+                        handleRemoteException(e, "getInterface");
                         return null;
                     }
                     break;
@@ -386,8 +386,8 @@ public class SupplicantStaIfaceHal {
                             supplicantIface.value = iface;
                         });
             } catch (RemoteException e) {
-                Log.e(TAG, "ISupplicant.createInterface exception: " + e);
-                supplicantServiceDiedHandler(ifaceName);
+                Log.e(TAG, "ISupplicant.addInterface exception: " + e);
+                handleRemoteException(e, "addInterface");
                 return null;
             }
             return supplicantIface.value;
@@ -438,7 +438,7 @@ public class SupplicantStaIfaceHal {
                 }
             } catch (RemoteException e) {
                 Log.e(TAG, "ISupplicant.removeInterface exception: " + e);
-                supplicantServiceDiedHandler(ifaceName);
+                handleRemoteException(e, "removeInterface");
                 return false;
             }
             return true;
@@ -479,13 +479,6 @@ public class SupplicantStaIfaceHal {
         }
     }
 
-    private void supplicantServiceDiedHandler(@NonNull String ifaceName) {
-        synchronized (mLock) {
-            mWifiMonitor.broadcastSupplicantDisconnectionEvent(ifaceName);
-            supplicantServiceDiedHandler();
-        }
-    }
-
     private void supplicantServiceDiedHandler() {
         synchronized (mLock) {
             for (String ifaceName : mISupplicantStaIfaces.keySet()) {
@@ -590,7 +583,7 @@ public class SupplicantStaIfaceHal {
                 return (getSupplicantMockableV1_1() != null);
             } catch (RemoteException e) {
                 Log.e(TAG, "ISupplicant.getService exception: " + e);
-                supplicantServiceDiedHandler();
+                handleRemoteException(e, "getSupplicantMockable");
                 return false;
             }
         }
@@ -2211,7 +2204,7 @@ public class SupplicantStaIfaceHal {
 
     private void handleRemoteException(RemoteException e, String methodStr) {
         synchronized (mLock) {
-            supplicantServiceDiedHandler();
+            clearState();
             Log.e(TAG, "ISupplicantStaIface." + methodStr + " failed with exception", e);
         }
     }