Merge "PNO: Changes in Native for new interface" into mm-wireless-dev

am: ffe70f78d0

* commit 'ffe70f78d0aca71e9c5af82f11472d422f14b301':
  PNO: Changes in Native for new interface

1 files changed, 18 insertions, 18 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
index 1adf0b940..5cb570746 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
@@ -968,10 +968,10 @@ public class WifiConfigManagerTest {
      * network in expectedNetworkIDOrder list.
      */
     private static void verifyPnoNetworkListOrder(
-            ArrayList<WifiNative.WifiPnoNetwork> pnoNetworkList,
+            ArrayList<WifiNative.PnoNetwork> pnoNetworkList,
             ArrayList<Integer> expectedNetworkIdOrder) throws Exception  {
         int i = 0;
-        for (WifiNative.WifiPnoNetwork pnoNetwork : pnoNetworkList) {
+        for (WifiNative.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());
@@ -979,11 +979,11 @@ public class WifiConfigManagerTest {
     }
 
     /**
-     * Verifies the retrieveDisconnectedWifiPnoNetworkList API. The test verifies that the list
+     * Verifies the retrieveDisconnectedPnoNetworkList API. The test verifies that the list
      * returned from the API is sorted as expected.
      */
     @Test
-    public void testDisconnectedWifiPnoNetworkListCreation() throws Exception {
+    public void testDisconnectedPnoNetworkListCreation() throws Exception {
         addNetworks();
 
         Random rand = new Random(WifiTestUtil.getTestMethod().hashCode());
@@ -1007,8 +1007,8 @@ public class WifiConfigManagerTest {
                 Log.i(TAG, "networkID: " + config.networkId + ", numAssociation: "
                         + config.numAssociation);
             }
-            ArrayList<WifiNative.WifiPnoNetwork> pnoNetworkList =
-                    mWifiConfigManager.retrieveDisconnectedWifiPnoNetworkList();
+            ArrayList<WifiNative.PnoNetwork> pnoNetworkList =
+                    mWifiConfigManager.retrieveDisconnectedPnoNetworkList();
             verifyPnoNetworkListOrder(pnoNetworkList,
                     new ArrayList(numAssociationToNetworkIdMap.values()));
         }
@@ -1030,8 +1030,8 @@ public class WifiConfigManagerTest {
                 priorityToNetworkIdMap.put(config.priority, config.networkId);
                 Log.i(TAG, "networkID: " + config.networkId + ", priority: " + config.priority);
             }
-            ArrayList<WifiNative.WifiPnoNetwork> pnoNetworkList =
-                    mWifiConfigManager.retrieveDisconnectedWifiPnoNetworkList();
+            ArrayList<WifiNative.PnoNetwork> pnoNetworkList =
+                    mWifiConfigManager.retrieveDisconnectedPnoNetworkList();
             verifyPnoNetworkListOrder(pnoNetworkList,
                     new ArrayList(priorityToNetworkIdMap.values()));
         }
@@ -1057,19 +1057,19 @@ public class WifiConfigManagerTest {
                 Log.i(TAG, "networkID: " + config.networkId + ", NetworkSelectionStatus: "
                         + config.getNetworkSelectionStatus().getNetworkSelectionStatus());
             }
-            ArrayList<WifiNative.WifiPnoNetwork> pnoNetworkList =
-                    mWifiConfigManager.retrieveDisconnectedWifiPnoNetworkList();
+            ArrayList<WifiNative.PnoNetwork> pnoNetworkList =
+                    mWifiConfigManager.retrieveDisconnectedPnoNetworkList();
             verifyPnoNetworkListOrder(pnoNetworkList,
                     new ArrayList(networkSelectionStatusToNetworkIdMap.values()));
         }
     }
 
     /**
-     * Verifies the retrieveConnectedWifiPnoNetworkList API. The test verifies that the list
+     * Verifies the retrieveConnectedPnoNetworkList API. The test verifies that the list
      * returned from the API is sorted as expected.
      */
     @Test
-    public void testConnectedWifiPnoNetworkListCreation() throws Exception {
+    public void testConnectedPnoNetworkListCreation() throws Exception {
         addNetworks();
 
         Random rand = new Random(WifiTestUtil.getTestMethod().hashCode());
@@ -1094,8 +1094,8 @@ public class WifiConfigManagerTest {
                 lastSeenToNetworkIdMap.put(lastSeenValue, config.networkId);
                 Log.i(TAG, "networkID: " + config.networkId + ", lastSeen: " + lastSeenValue);
             }
-            ArrayList<WifiNative.WifiPnoNetwork> pnoNetworkList =
-                    mWifiConfigManager.retrieveConnectedWifiPnoNetworkList();
+            ArrayList<WifiNative.PnoNetwork> pnoNetworkList =
+                    mWifiConfigManager.retrieveConnectedPnoNetworkList();
             verifyPnoNetworkListOrder(pnoNetworkList,
                     new ArrayList(lastSeenToNetworkIdMap.values()));
         }
@@ -1120,8 +1120,8 @@ public class WifiConfigManagerTest {
                 Log.i(TAG, "networkID: " + config.networkId + ", numAssociation: "
                         + config.numAssociation);
             }
-            ArrayList<WifiNative.WifiPnoNetwork> pnoNetworkList =
-                    mWifiConfigManager.retrieveConnectedWifiPnoNetworkList();
+            ArrayList<WifiNative.PnoNetwork> pnoNetworkList =
+                    mWifiConfigManager.retrieveConnectedPnoNetworkList();
             verifyPnoNetworkListOrder(pnoNetworkList,
                     new ArrayList(numAssociationToNetworkIdMap.values()));
         }
@@ -1147,8 +1147,8 @@ public class WifiConfigManagerTest {
                 Log.i(TAG, "networkID: " + config.networkId + ", NetworkSelectionStatus: "
                         + config.getNetworkSelectionStatus().getNetworkSelectionStatus());
             }
-            ArrayList<WifiNative.WifiPnoNetwork> pnoNetworkList =
-                    mWifiConfigManager.retrieveConnectedWifiPnoNetworkList();
+            ArrayList<WifiNative.PnoNetwork> pnoNetworkList =
+                    mWifiConfigManager.retrieveConnectedPnoNetworkList();
             verifyPnoNetworkListOrder(pnoNetworkList,
                     new ArrayList(networkSelectionStatusToNetworkIdMap.values()));
         }