Merge "Revert "HalDeviceManager: Get IWifi proxy immediately"" into oc-dr1-dev

am: a7c7f879ba

Change-Id: Id40102adf00adc10138d7cc5be771a042d0672db

1 files changed, 3 insertions, 3 deletions

diff --git a/service/java/com/android/server/wifi/HalDeviceManager.java b/service/java/com/android/server/wifi/HalDeviceManager.java
index bcc0348a8..4382c8126 100644
--- a/service/java/com/android/server/wifi/HalDeviceManager.java
+++ b/service/java/com/android/server/wifi/HalDeviceManager.java
@@ -532,7 +532,6 @@ public class HalDeviceManager {
 
     private void initializeInternal() {
         initIServiceManagerIfNecessary();
-        initIWifiIfNecessary();
     }
 
     private void teardownInternal() {
@@ -562,7 +561,9 @@ public class HalDeviceManager {
                     Log.d(TAG, "IWifi registration notification: fqName=" + fqName
                             + ", name=" + name + ", preexisting=" + preexisting);
                     synchronized (mLock) {
+                        mWifi = null; // get rid of old copy!
                         initIWifiIfNecessary();
+                        stopWifi(); // just in case
                     }
                 }
             };
@@ -672,8 +673,7 @@ public class HalDeviceManager {
                     mWifi = null;
                     return;
                 }
-                // Stopping wifi just in case. This would also trigger the status callback.
-                stopWifi();
+                managerStatusListenerDispatch();
             } catch (RemoteException e) {
                 Log.e(TAG, "Exception while operating on IWifi: " + e);
             }