diff options
| author | Roshan Pius <rpius@google.com> | 2017-07-24 19:11:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-24 19:11:02 +0000 |
| commit | 18681d03460f476814aadbb678b20e1fc4153297 (patch) | |
| tree | 1fc6a822d6d8f73b5df849fdcc02ac2101f1a092 /service | |
| parent | d5bf7032c696ad8f6a607050a33c42fdd7eff944 (diff) | |
| parent | f289d0be14c14fa1f332e62471565bbc4c725fa0 (diff) | |
Merge "HalDeviceManager: Lock the service manager callback" into oc-dr1-dev
am: f289d0be14
Change-Id: I1f5531e2cb09a263c0b3ea75d9d4ee6541ac2f00
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/HalDeviceManager.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/HalDeviceManager.java b/service/java/com/android/server/wifi/HalDeviceManager.java index 383a76150..4382c8126 100644 --- a/service/java/com/android/server/wifi/HalDeviceManager.java +++ b/service/java/com/android/server/wifi/HalDeviceManager.java @@ -560,9 +560,11 @@ public class HalDeviceManager { boolean preexisting) { Log.d(TAG, "IWifi registration notification: fqName=" + fqName + ", name=" + name + ", preexisting=" + preexisting); - mWifi = null; // get rid of old copy! - initIWifiIfNecessary(); - stopWifi(); // just in case + synchronized (mLock) { + mWifi = null; // get rid of old copy! + initIWifiIfNecessary(); + stopWifi(); // just in case + } } }; |