diff options
author | Roshan Pius <rpius@google.com> | 2017-03-09 09:11:35 -0800 |
---|---|---|
committer | Roshan Pius <rpius@google.com> | 2017-03-09 14:00:31 -0800 |
commit | b8b3fb8228a1f90106bad8c59ce006b81ef7921c (patch) | |
tree | 383e1994008fb687a941c029691e3b375b0c0206 /service/java/com/android/server/wifi/scanner/HalWifiScannerImpl.java | |
parent | 96c464e93515cda4326ca93ecf8a90c9ab551b7f (diff) | |
download | android_frameworks_opt_net_wifi-b8b3fb8228a1f90106bad8c59ce006b81ef7921c.tar.gz android_frameworks_opt_net_wifi-b8b3fb8228a1f90106bad8c59ce006b81ef7921c.tar.bz2 android_frameworks_opt_net_wifi-b8b3fb8228a1f90106bad8c59ce006b81ef7921c.zip |
Remove all legacy HAL usage from framework
WifiNative now just becomes a module to route calls into the appropriate
native module: WifiVendorHal, WificondControl, SupplicantStaIfaceHal,
SupplicantP2pIfaceHal.
Changes in the CL:
1. Cleanup WifiNative to remove the legacy HAL usage.
2. Remove the |HIDL*| flags in WifiNative.
3. Remove static instance of WifiNative/WifiMonitor.
4. Remove WifiMonitor code parsing the string events from
wpa_supplicant.
5. Remove all unused jni code used for legacy HAL interactions.
6. Remove dependency of libwifi-hal & libwifi-system from framework.
Notes:
a) We can now potentially split up WifiNative into separate chunks:
WifiStaNative, WifiP2pNative, WifiRttNative, etc instead of having a
monolithic WifiNative instance.
b) We may have to add back the local log in WifiNative (b/36059665).
Bug: 35702893
Bug: 34457880
Bug: 34884202
Bug: 35421721
Test: Compiles, existing unit tests pass.
Test: Device boots up and connects to wifi networks.
Test: Verified with wifi regression (b/36068282)
Change-Id: I3e13522c912242af8023471e029edb1ce47fd3e9
Diffstat (limited to 'service/java/com/android/server/wifi/scanner/HalWifiScannerImpl.java')
-rw-r--r-- | service/java/com/android/server/wifi/scanner/HalWifiScannerImpl.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/scanner/HalWifiScannerImpl.java b/service/java/com/android/server/wifi/scanner/HalWifiScannerImpl.java index d85c818d2..97c69382e 100644 --- a/service/java/com/android/server/wifi/scanner/HalWifiScannerImpl.java +++ b/service/java/com/android/server/wifi/scanner/HalWifiScannerImpl.java @@ -24,6 +24,7 @@ import android.os.Message; import android.util.Log; import com.android.server.wifi.Clock; +import com.android.server.wifi.WifiMonitor; import com.android.server.wifi.WifiNative; /** @@ -40,11 +41,13 @@ public class HalWifiScannerImpl extends WifiScannerImpl implements Handler.Callb private final SupplicantWifiScannerImpl mSupplicantScannerDelegate; private final boolean mHalBasedPnoSupported; - public HalWifiScannerImpl(Context context, WifiNative wifiNative, Looper looper, Clock clock) { + public HalWifiScannerImpl(Context context, WifiNative wifiNative, WifiMonitor wifiMonitor, + Looper looper, Clock clock) { mWifiNative = wifiNative; mChannelHelper = new HalChannelHelper(wifiNative); mSupplicantScannerDelegate = - new SupplicantWifiScannerImpl(context, wifiNative, mChannelHelper, looper, clock); + new SupplicantWifiScannerImpl(context, wifiNative, wifiMonitor, mChannelHelper, + looper, clock); // We are not going to support HAL ePNO currently. mHalBasedPnoSupported = false; |