summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-05-18 17:37:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-05-18 17:37:08 +0000
commite93744bec9cb63b00b4597d49a20378749634358 (patch)
tree02bec7790f15887e762a5f4f4d45d6bbc762c6d8 /service
parentd94eb7a0e5d182f9dce6ff04bb0329dedd879327 (diff)
parentddaa720025e435d3c21aa200c00c8da64c95e289 (diff)
Merge "WifiVendorHal: Make HAL state change callback synchronous" into pi-dev
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;
}