summaryrefslogtreecommitdiffstats
path: root/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2017-03-09 09:11:35 -0800
committerRoshan Pius <rpius@google.com>2017-03-09 14:00:31 -0800
commitb8b3fb8228a1f90106bad8c59ce006b81ef7921c (patch)
tree383e1994008fb687a941c029691e3b375b0c0206 /tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
parent96c464e93515cda4326ca93ecf8a90c9ab551b7f (diff)
downloadandroid_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 'tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java')
-rw-r--r--tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
index a56773ec0..59f26bce7 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
@@ -364,10 +364,12 @@ public class WifiStateMachineTest {
any(WifiConfiguration.class)))
.thenReturn(mSoftApManager);
when(mWifiInjector.getPasspointManager()).thenReturn(mPasspointManager);
+ when(mWifiInjector.getWifiStateTracker()).thenReturn(mWifiStateTracker);
+ when(mWifiInjector.getWifiMonitor()).thenReturn(mWifiMonitor);
+ when(mWifiInjector.getWifiNative()).thenReturn(mWifiNative);
when(mWifiNative.setupForClientMode()).thenReturn(mClientInterface);
when(mWifiNative.setupForSoftApMode()).thenReturn(mApInterface);
- when(mWifiInjector.getWifiStateTracker()).thenReturn(mWifiStateTracker);
when(mWifiNative.getInterfaceName()).thenReturn("mockWlan");
when(mWifiNative.enableSupplicant()).thenReturn(true);
when(mWifiNative.disableSupplicant()).thenReturn(true);