From 1d734366a2d46e8de37ece9333ddce2008fa348d Mon Sep 17 00:00:00 2001 From: Sticky Chen Date: Tue, 11 Jun 2019 13:01:33 +0800 Subject: Handle native event in wifi thread To prevent deadlocks while processing native callback or death as we're in the midst of performing some state changes, post the native notification to the wifi thread. Bug: 134987917 Test: Performed some basic tests (toggle wifi,softap, etc) Test: atest com.android.server.wifi.HalDeviceManagerTest Change-Id: Id24aa61ae51d254cfc937691475b19977e5c508d (cherry-picked from ed9610cd4f703b8864fb2eb167bbbdce37561724) --- service/java/com/android/server/wifi/WifiInjector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'service/java/com/android/server/wifi/WifiInjector.java') diff --git a/service/java/com/android/server/wifi/WifiInjector.java b/service/java/com/android/server/wifi/WifiInjector.java index 178c98f6d..f33c7cf93 100644 --- a/service/java/com/android/server/wifi/WifiInjector.java +++ b/service/java/com/android/server/wifi/WifiInjector.java @@ -202,7 +202,7 @@ public class WifiInjector { mCellularLinkLayerStatsCollector); // Modules interacting with Native. mWifiMonitor = new WifiMonitor(this); - mHalDeviceManager = new HalDeviceManager(mClock); + mHalDeviceManager = new HalDeviceManager(mClock, clientModeImplLooper); mWifiVendorHal = new WifiVendorHal(mHalDeviceManager, mWifiCoreHandlerThread.getLooper()); mSupplicantStaIfaceHal = -- cgit v1.2.3