Merge "Changed order of metered network check." into nyc-dev
am: 901854e
* commit '901854eb92bcc8b12d9aaf350210e72eb7585416':
Changed order of metered network check.
Change-Id: Iad87c8f35e2a1aac56b9581e2c3f035dd02141e0
diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
index 2b7dd39..27d4a2b 100644
--- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
+++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
@@ -279,12 +279,13 @@
Log.w(TAG, "Active network not metered: " + info);
}
final String netId = setWifiMeteredStatus(true);
- assertTrue("Could not set wifi '" + netId + "' as metered ("
- + mCm.getActiveNetworkInfo() +")", mCm.isActiveNetworkMetered());
+
// Set flag so status is reverted on resetMeteredNetwork();
mMeteredWifi = netId;
// Sanity check.
- assertMeteredNetwork(netId, true);
+ assertWifiMeteredStatus(netId, true);
+ assertTrue("Could not set wifi '" + netId + "' as metered ("
+ + mCm.getActiveNetworkInfo() +")", mCm.isActiveNetworkMetered());
}
protected void resetMeteredNetwork() throws Exception {
@@ -319,7 +320,7 @@
return netId;
}
- private void assertMeteredNetwork(String netId, boolean status) throws Exception {
+ private void assertWifiMeteredStatus(String netId, boolean status) throws Exception {
final String command = "cmd netpolicy list wifi-networks";
final String expectedLine = netId + ";" + status;
assertDelayedShellCommand(command, new ExpectResultChecker() {