diff options
| author | Roshan Pius <rpius@google.com> | 2016-03-07 19:24:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-07 19:24:23 +0000 |
| commit | 0a21d6c371532509c566ddf1cc485f99f1abdb57 (patch) | |
| tree | 2682827d9fffbc2ae4da31a5a9d38a817e8d3e9d /tests | |
| parent | df14c4522d4e948a2ae21a27de2ee926c32b9b5e (diff) | |
| parent | 3a2b55ba283dec0d3e3421bdd27568ad0644bd7e (diff) | |
Merge "WifiConfigManager: Change PNO network list type" into mm-wireless-dev
am: 3a2b55ba28
* commit '3a2b55ba283dec0d3e3421bdd27568ad0644bd7e':
WifiConfigManager: Change PNO network list type
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java index 5cb570746..e1ccf3235 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java @@ -42,6 +42,7 @@ import android.net.wifi.WifiConfiguration.KeyMgmt; import android.net.wifi.WifiEnterpriseConfig; import android.net.wifi.WifiEnterpriseConfig.Eap; import android.net.wifi.WifiEnterpriseConfig.Phase2; +import android.net.wifi.WifiScanner; import android.os.Process; import android.os.UserHandle; import android.os.UserManager; @@ -968,10 +969,10 @@ public class WifiConfigManagerTest { * network in expectedNetworkIDOrder list. */ private static void verifyPnoNetworkListOrder( - ArrayList<WifiNative.PnoNetwork> pnoNetworkList, + ArrayList<WifiScanner.PnoSettings.PnoNetwork> pnoNetworkList, ArrayList<Integer> expectedNetworkIdOrder) throws Exception { int i = 0; - for (WifiNative.PnoNetwork pnoNetwork : pnoNetworkList) { + for (WifiScanner.PnoSettings.PnoNetwork pnoNetwork : pnoNetworkList) { Log.i(TAG, "PNO Network List Index: " + i + ", networkID: " + pnoNetwork.networkId); assertEquals("Expected network ID: " + pnoNetwork.networkId, pnoNetwork.networkId, expectedNetworkIdOrder.get(i++).intValue()); @@ -1007,7 +1008,7 @@ public class WifiConfigManagerTest { Log.i(TAG, "networkID: " + config.networkId + ", numAssociation: " + config.numAssociation); } - ArrayList<WifiNative.PnoNetwork> pnoNetworkList = + ArrayList<WifiScanner.PnoSettings.PnoNetwork> pnoNetworkList = mWifiConfigManager.retrieveDisconnectedPnoNetworkList(); verifyPnoNetworkListOrder(pnoNetworkList, new ArrayList(numAssociationToNetworkIdMap.values())); @@ -1030,7 +1031,7 @@ public class WifiConfigManagerTest { priorityToNetworkIdMap.put(config.priority, config.networkId); Log.i(TAG, "networkID: " + config.networkId + ", priority: " + config.priority); } - ArrayList<WifiNative.PnoNetwork> pnoNetworkList = + ArrayList<WifiScanner.PnoSettings.PnoNetwork> pnoNetworkList = mWifiConfigManager.retrieveDisconnectedPnoNetworkList(); verifyPnoNetworkListOrder(pnoNetworkList, new ArrayList(priorityToNetworkIdMap.values())); @@ -1057,7 +1058,7 @@ public class WifiConfigManagerTest { Log.i(TAG, "networkID: " + config.networkId + ", NetworkSelectionStatus: " + config.getNetworkSelectionStatus().getNetworkSelectionStatus()); } - ArrayList<WifiNative.PnoNetwork> pnoNetworkList = + ArrayList<WifiScanner.PnoSettings.PnoNetwork> pnoNetworkList = mWifiConfigManager.retrieveDisconnectedPnoNetworkList(); verifyPnoNetworkListOrder(pnoNetworkList, new ArrayList(networkSelectionStatusToNetworkIdMap.values())); @@ -1094,7 +1095,7 @@ public class WifiConfigManagerTest { lastSeenToNetworkIdMap.put(lastSeenValue, config.networkId); Log.i(TAG, "networkID: " + config.networkId + ", lastSeen: " + lastSeenValue); } - ArrayList<WifiNative.PnoNetwork> pnoNetworkList = + ArrayList<WifiScanner.PnoSettings.PnoNetwork> pnoNetworkList = mWifiConfigManager.retrieveConnectedPnoNetworkList(); verifyPnoNetworkListOrder(pnoNetworkList, new ArrayList(lastSeenToNetworkIdMap.values())); @@ -1120,7 +1121,7 @@ public class WifiConfigManagerTest { Log.i(TAG, "networkID: " + config.networkId + ", numAssociation: " + config.numAssociation); } - ArrayList<WifiNative.PnoNetwork> pnoNetworkList = + ArrayList<WifiScanner.PnoSettings.PnoNetwork> pnoNetworkList = mWifiConfigManager.retrieveConnectedPnoNetworkList(); verifyPnoNetworkListOrder(pnoNetworkList, new ArrayList(numAssociationToNetworkIdMap.values())); @@ -1147,7 +1148,7 @@ public class WifiConfigManagerTest { Log.i(TAG, "networkID: " + config.networkId + ", NetworkSelectionStatus: " + config.getNetworkSelectionStatus().getNetworkSelectionStatus()); } - ArrayList<WifiNative.PnoNetwork> pnoNetworkList = + ArrayList<WifiScanner.PnoSettings.PnoNetwork> pnoNetworkList = mWifiConfigManager.retrieveConnectedPnoNetworkList(); verifyPnoNetworkListOrder(pnoNetworkList, new ArrayList(networkSelectionStatusToNetworkIdMap.values())); |