Merge cherrypicks of [13217948, 13218047] into mainline-releaseandroid-mainline-11.0.0_r6android-mainline-11.0.0_r4android11-mainline-sparse-2021-jan-release

Change-Id: Ib7e46df423d47260d9608fcd03eb95d84e79fdcf

1 files changed, 18 insertions, 11 deletions

diff --git a/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java b/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
index a5bfb0f64c6..cf4e8ac2331 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
@@ -1883,30 +1883,37 @@ public class WifiManagerTest extends WifiJUnit3TestBase {
         TestActionListener actionListener = new TestActionListener(mLock);
         UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
         List<WifiConfiguration> savedNetworks = null;
-        WifiConfiguration savedNetwork = null;
+        WifiConfiguration currentConfig = null;
         try {
             uiAutomation.adoptShellPermissionIdentity();
             // These below API's only work with privileged permissions (obtained via shell identity
             // for test)
-            savedNetworks = mWifiManager.getConfiguredNetworks();
-
-            // Ensure that the saved network is not metered.
-            savedNetwork = savedNetworks.get(0);
-            assertNotEquals("Ensure that the saved network is configured as unmetered",
-                    savedNetwork.meteredOverride,
-                    WifiConfiguration.METERED_OVERRIDE_METERED);
 
             // Trigger a scan & wait for connection to one of the saved networks.
             mWifiManager.startScan();
             waitForConnection();
 
+            WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
+
+            // find the current network's WifiConfiguration
+            currentConfig = mWifiManager.getConfiguredNetworks()
+                    .stream()
+                    .filter(config -> config.networkId == wifiInfo.getNetworkId())
+                    .findAny()
+                    .get();
+
+            // Ensure that the current network is not metered.
+            assertNotEquals("Ensure that the saved network is configured as unmetered",
+                    currentConfig.meteredOverride,
+                    WifiConfiguration.METERED_OVERRIDE_METERED);
+
             // Check the network capabilities to ensure that the network is marked not metered.
             waitForNetworkCallbackAndCheckForMeteredness(false);
 
             // Now mark the network metered and save.
             synchronized (mLock) {
                 try {
-                    WifiConfiguration modSavedNetwork = new WifiConfiguration(savedNetwork);
+                    WifiConfiguration modSavedNetwork = new WifiConfiguration(currentConfig);
                     modSavedNetwork.meteredOverride = WifiConfiguration.METERED_OVERRIDE_METERED;
                     mWifiManager.save(modSavedNetwork, actionListener);
                     // now wait for callback
@@ -1924,8 +1931,8 @@ public class WifiManagerTest extends WifiJUnit3TestBase {
 
         } finally {
             // Restore original network config (restore the meteredness back);
-            if (savedNetwork != null) {
-                mWifiManager.updateNetwork(savedNetwork);
+            if (currentConfig != null) {
+                mWifiManager.updateNetwork(currentConfig);
             }
             uiAutomation.dropShellPermissionIdentity();
         }