From 9bd01d6cb65ea96d6729d35a1fc43bb2bb40e3bd Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Tue, 1 Mar 2016 16:34:48 -0800 Subject: PNO: Changes in Native for new interface Changes in WifiNative to accomodate the new Scanner based PNO interface. Currently, we're just setting the |wifi_epno_network| list member in |wifi_epno_params| structure. All the other values are being ignored. 1. Change the native |android_net_wifi_setPnoListNative| to accept the PNO settings parameter instead of directly accepting the list of networks. 2. Changes in WifiNative to send down the new |PnoSettings| structure down to the native code instead of directly sending the list. a. Keep the existing interface from |WifiStateMachine| which accepts a |PnoNetwork| list and converts it into |PnoSettings| structure. This interface will be removed once all the new Scanner based interface plumbing is complete. 3. Add a separate native API to reset PNO list. While there, Remove redundant "Wifi" prefix from Pno class names. BUG: 27167559 Change-Id: I78d35c20b4bb7a12c51d0c2cc609fb7bcb5ae516 TEST: Compiles & unit-test passes --- .../android/server/wifi/WifiConfigManagerTest.java | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'tests') 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 pnoNetworkList, + ArrayList pnoNetworkList, ArrayList 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 pnoNetworkList = - mWifiConfigManager.retrieveDisconnectedWifiPnoNetworkList(); + ArrayList 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 pnoNetworkList = - mWifiConfigManager.retrieveDisconnectedWifiPnoNetworkList(); + ArrayList 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 pnoNetworkList = - mWifiConfigManager.retrieveDisconnectedWifiPnoNetworkList(); + ArrayList 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 pnoNetworkList = - mWifiConfigManager.retrieveConnectedWifiPnoNetworkList(); + ArrayList 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 pnoNetworkList = - mWifiConfigManager.retrieveConnectedWifiPnoNetworkList(); + ArrayList 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 pnoNetworkList = - mWifiConfigManager.retrieveConnectedWifiPnoNetworkList(); + ArrayList pnoNetworkList = + mWifiConfigManager.retrieveConnectedPnoNetworkList(); verifyPnoNetworkListOrder(pnoNetworkList, new ArrayList(networkSelectionStatusToNetworkIdMap.values())); } -- cgit v1.2.3