diff options
author | Roshan Pius <rpius@google.com> | 2017-02-17 15:47:42 -0800 |
---|---|---|
committer | Roshan Pius <rpius@google.com> | 2017-02-22 14:50:58 -0800 |
commit | f3aae0be78cd02f5fedd7d99b73536d2c799b030 (patch) | |
tree | db0601ae65775a67ea1a37a01ff533c6d972451d /tests | |
parent | 67bbcdc2c81824ff671a5a1d8475a598199e342e (diff) |
Remove unused/unwanted WifiNative methods
Remove a bunch of unused/not needed WifiNative methods and change method
signatures in preparation for integration with HIDL interface.
1. Remove the ping command since this is no longer exposed in the public
API.
2. enable/disableNetwork, blacklist, hs20 methods are no longer used.
3. saveConfig method no longer needed since wpa_supplicant is
not the config store.
4. setScanInterval is no longer needed since scanning is controlled by
wificond.
5. enableAutoConnect is no longer needed since auto connect is
controlled by QNS.
Bug: 33383725
Test: Compiles
Change-Id: Iaf8631b583cd380fbcbc90c88e2734c44c65049a
Diffstat (limited to 'tests')
-rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiConfigStoreLegacyTest.java | 4 | ||||
-rw-r--r-- | tests/wifitests/src/com/android/server/wifi/scanner/SupplicantPnoScannerTest.java | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreLegacyTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreLegacyTest.java index 271cc1878..386a86d1b 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreLegacyTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreLegacyTest.java @@ -96,13 +96,13 @@ public class WifiConfigStoreLegacyTest { // Return the config data with passwords masked from wpa_supplicant control interface. doAnswer(new AnswerWithArguments() { - public int answer(Map<String, WifiConfiguration> configs, + public boolean answer(Map<String, WifiConfiguration> configs, SparseArray<Map<String, String>> networkExtras) { for (Map.Entry<String, WifiConfiguration> entry: createWpaSupplicantLoadData(networks).entrySet()) { configs.put(entry.getKey(), entry.getValue()); } - return 0; + return true; } }).when(mWifiNative).migrateNetworksFromSupplicant(any(Map.class), any(SparseArray.class)); diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/SupplicantPnoScannerTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/SupplicantPnoScannerTest.java index 34b0b102c..6ff602850 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/SupplicantPnoScannerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/SupplicantPnoScannerTest.java @@ -388,7 +388,6 @@ public class SupplicantPnoScannerTest { WifiNative.PnoEventHandler pnoEventHandler) { reset(mWifiNative); when(mWifiNative.setNetworkVariable(anyInt(), anyString(), anyString())).thenReturn(true); - when(mWifiNative.enableNetworkWithoutConnect(anyInt())).thenReturn(true); // Scans succeed when(mWifiNative.scan(any(Set.class), any(Set.class))).thenReturn(true); when(mWifiNative.setPnoScan(anyBoolean())).thenReturn(true); |