diff options
| author | Roshan Pius <rpius@google.com> | 2017-05-31 09:45:04 -0700 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2017-06-01 17:17:21 +0000 |
| commit | 03c23584f072aef576736044c1fa12ddcb2d882b (patch) | |
| tree | 20e6efd0447b41f1952c5b81cea5eae1f5d47277 /tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java | |
| parent | 5b98efa341aae055ea9b718218aa9792d1667f31 (diff) | |
| download | android_frameworks_opt_net_wifi-03c23584f072aef576736044c1fa12ddcb2d882b.tar.gz android_frameworks_opt_net_wifi-03c23584f072aef576736044c1fa12ddcb2d882b.tar.bz2 android_frameworks_opt_net_wifi-03c23584f072aef576736044c1fa12ddcb2d882b.zip | |
WifiConfigManager: Rename scan result to network lookup method
Rename from |getSavedNetworkForScanDetailAndCache| to
|getConfiguredNetworkForScanDetailAndCache| because the method might
also return the configured ephemeral network matching the scan result.
Bug: 62202610
Test: Unit tests
Change-Id: I6fa4c23bde017c412b10b31a350b5c780fc8a672
Diffstat (limited to 'tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java index 9c78c9b12..66507f5ca 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSelectorTestUtil.java @@ -292,19 +292,19 @@ public class WifiNetworkSelectorTestUtil { if (scanDetails.size() <= configs.length) { for (int i = 0; i < scanDetails.size(); i++) { ScanDetail scanDetail = scanDetails.get(i); - when(wifiConfigManager.getSavedNetworkForScanDetailAndCache(eq(scanDetail))) + when(wifiConfigManager.getConfiguredNetworkForScanDetailAndCache(eq(scanDetail))) .thenReturn(configs[i]); } } else { for (int i = 0; i < configs.length; i++) { ScanDetail scanDetail = scanDetails.get(i); - when(wifiConfigManager.getSavedNetworkForScanDetailAndCache(eq(scanDetail))) + when(wifiConfigManager.getConfiguredNetworkForScanDetailAndCache(eq(scanDetail))) .thenReturn(configs[i]); } // associated the remaining scan details with a NULL config. for (int i = configs.length; i < scanDetails.size(); i++) { - when(wifiConfigManager.getSavedNetworkForScanDetailAndCache( + when(wifiConfigManager.getConfiguredNetworkForScanDetailAndCache( eq(scanDetails.get(i)))).thenReturn(null); } } @@ -370,7 +370,7 @@ public class WifiNetworkSelectorTestUtil { config.networkId = networkId; config.meteredHint = meteredHint; - when(wifiConfigManager.getSavedNetworkForScanDetailAndCache(eq(scanDetail))) + when(wifiConfigManager.getConfiguredNetworkForScanDetailAndCache(eq(scanDetail))) .thenReturn(new WifiConfiguration(config)); when(wifiConfigManager.getConfiguredNetwork(eq(networkId))) .then(new AnswerWithArguments() { |