diff options
| author | Roshan Pius <rpius@google.com> | 2017-02-17 14:26:58 -0800 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2017-02-22 14:50:58 -0800 |
| commit | 24250365afbd9a20b2e03364eddf2025c8f1138a (patch) | |
| tree | a0104f8451b0de140ae4260f511573cbd3405d4b /service/java/com/android/server/wifi/WifiMonitor.java | |
| parent | f3aae0be78cd02f5fedd7d99b73536d2c799b030 (diff) | |
| download | android_frameworks_opt_net_wifi-24250365afbd9a20b2e03364eddf2025c8f1138a.tar.gz android_frameworks_opt_net_wifi-24250365afbd9a20b2e03364eddf2025c8f1138a.tar.bz2 android_frameworks_opt_net_wifi-24250365afbd9a20b2e03364eddf2025c8f1138a.zip | |
WifiNative: Start supplicant HIDL integration
Remove the |initializeSupplicantHal| call and use the existing
|connectToSupplicant| call to initialize the SupplicantStaIfaceHal &
SupplicantStaP2pIfaceHal. This will ensure that we keep the existing
startup sequence.
Also, don't start the wifimonitor thread if HIDL is enabled.
Bug: 33383725
Test: Existing unit tests
Change-Id: Id082eedb27d7d7dae1bd26f40da9b8e23ee2ce10
Diffstat (limited to 'service/java/com/android/server/wifi/WifiMonitor.java')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiMonitor.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiMonitor.java b/service/java/com/android/server/wifi/WifiMonitor.java index cf2efd4bb..115841b72 100644 --- a/service/java/com/android/server/wifi/WifiMonitor.java +++ b/service/java/com/android/server/wifi/WifiMonitor.java @@ -617,7 +617,9 @@ public class WifiMonitor { while (true) { if (mWifiNative.connectToSupplicant()) { mConnected = true; - new MonitorThread(mWifiNative.getLocalLog()).start(); + if (!WifiNative.HIDL_SUP_ENABLE) { + new MonitorThread(mWifiNative.getLocalLog()).start(); + } return true; } if (connectTries++ < 5) { |