summaryrefslogtreecommitdiffstats
path: root/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
diff options
context:
space:
mode:
authorRandy Pan <zpan@google.com>2017-02-03 14:19:24 -0800
committerRandy Pan <zpan@google.com>2017-03-28 11:59:22 -0700
commit17c2a7b30e5680b11fc0073ce322ee7bc14ef2c5 (patch)
tree1d695f8ab3c33d5e6981ef19eb652e38281875f7 /tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
parentab8c62a5c348702090aceee23de12945cc3fdb0d (diff)
downloadandroid_frameworks_opt_net_wifi-17c2a7b30e5680b11fc0073ce322ee7bc14ef2c5.tar.gz
android_frameworks_opt_net_wifi-17c2a7b30e5680b11fc0073ce322ee7bc14ef2c5.tar.bz2
android_frameworks_opt_net_wifi-17c2a7b30e5680b11fc0073ce322ee7bc14ef2c5.zip
Local log buffer shared by connectivity modules
Move the creation of the local log buffer for connectivity modules to WifiInjector. Then pass it over to all the connectivity modules. Dump the log buffer via WifiConnectivityManager. While there, removed the null check in localLog() for all the connectivity modules. Bug: 35642622 Test: runtest.sh and manual test Change-Id: I31866c6fecdd9f50061f47e34e16c701ff230a6c
Diffstat (limited to 'tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java')
-rw-r--r--tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java1
1 files changed, 0 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 ad441f54d..ab8ab0da0 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
@@ -360,7 +360,6 @@ public class WifiStateMachineTest {
when(mWifiInjector.makeWificond()).thenReturn(mWificond);
when(mWifiInjector.getWifiConfigManager()).thenReturn(mWifiConfigManager);
when(mWifiInjector.getWifiScanner()).thenReturn(mWifiScanner);
- when(mWifiInjector.getWifiNetworkSelector()).thenReturn(mock(WifiNetworkSelector.class));
when(mWifiInjector.makeWifiConnectivityManager(any(WifiInfo.class), anyBoolean()))
.thenReturn(mWifiConnectivityManager);
when(mWifiInjector.makeSoftApManager(any(INetworkManagementService.class),