diff options
author | Sticky Chen <sticky.chen@mediatek.com> | 2019-06-11 13:01:33 +0800 |
---|---|---|
committer | Roshan Pius <rpius@google.com> | 2019-06-11 19:43:55 +0000 |
commit | 1d734366a2d46e8de37ece9333ddce2008fa348d (patch) | |
tree | 80e1f88cff0102c2d0c8133ff5ce4c7a8df5b20c /service/java/com/android/server/wifi/WifiInjector.java | |
parent | 724f5ef108fb3f3aec0ede58b77610000f6bc0c1 (diff) | |
download | android_frameworks_opt_net_wifi-1d734366a2d46e8de37ece9333ddce2008fa348d.tar.gz android_frameworks_opt_net_wifi-1d734366a2d46e8de37ece9333ddce2008fa348d.tar.bz2 android_frameworks_opt_net_wifi-1d734366a2d46e8de37ece9333ddce2008fa348d.zip |
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)
Diffstat (limited to 'service/java/com/android/server/wifi/WifiInjector.java')
-rw-r--r-- | service/java/com/android/server/wifi/WifiInjector.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 = |