summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2018-05-17 16:38:51 -0700
committerRoshan Pius <rpius@google.com>2018-05-17 16:40:19 -0700
commitddaa720025e435d3c21aa200c00c8da64c95e289 (patch)
tree465b311629906aff5ee41f1606184b8d1991f0f4 /service
parent89b55624576c60a1a42b9111c8bde2011f57a407 (diff)
WifiVendorHal: Make HAL state change callback synchronous
Ensure that the HAL callback is synchronous (not posted to handler because it will cause a race with the onDestroyed callback is synchronous). Bug: 79532177 Test: Unit tests Test: Kill wifi HAL and ensured that interface is not destroyed by HalDeviceManager before WifiStateMachine processed the death notification. Change-Id: Ie9237609466d790a4a09b8bc2d2648fef9414546
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/WifiVendorHal.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiVendorHal.java b/service/java/com/android/server/wifi/WifiVendorHal.java
index 6041a681f..f5b118795 100644
--- a/service/java/com/android/server/wifi/WifiVendorHal.java
+++ b/service/java/com/android/server/wifi/WifiVendorHal.java
@@ -297,8 +297,7 @@ public class WifiVendorHal {
public boolean initialize(WifiNative.VendorHalDeathEventHandler handler) {
synchronized (sLock) {
mHalDeviceManager.initialize();
- mHalDeviceManager.registerStatusListener(mHalDeviceManagerStatusCallbacks,
- mHalEventHandler);
+ mHalDeviceManager.registerStatusListener(mHalDeviceManagerStatusCallbacks, null);
mDeathEventHandler = handler;
return true;
}