Update netpolicy tests to not assume DUT will be plugged-in.
Bug: 73037837
Bug: 72656089
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: I79aaaf083255626896901fcfdade70b4705cfc06
diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractAppIdleTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractAppIdleTestCase.java
index 133a43b..0e141c0 100644
--- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractAppIdleTestCase.java
+++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractAppIdleTestCase.java
@@ -34,7 +34,7 @@
removePowerSaveModeWhitelist(TEST_APP2_PKG);
removePowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG);
setAppIdle(false);
- turnBatteryOff();
+ turnBatteryOn();
registerBroadcastReceiver();
}
@@ -48,7 +48,7 @@
try {
tearDownMeteredNetwork();
} finally {
- turnBatteryOn();
+ turnBatteryOff();
setAppIdle(false);
}
}
@@ -155,9 +155,9 @@
// Check that app is paroled when charging
setAppIdle(true);
assertBackgroundNetworkAccess(false);
- turnBatteryOn();
- assertBackgroundNetworkAccess(true);
turnBatteryOff();
+ assertBackgroundNetworkAccess(true);
+ turnBatteryOn();
assertBackgroundNetworkAccess(false);
// Check that app is restricted when not idle but power-save is on
@@ -167,11 +167,11 @@
assertBackgroundNetworkAccess(false);
// Use setBatterySaverMode API to leave power-save mode instead of plugging in charger
setBatterySaverMode(false);
- turnBatteryOn();
+ turnBatteryOff();
assertBackgroundNetworkAccess(true);
// And when no longer charging, it still has network access, since it's not idle
- turnBatteryOff();
+ turnBatteryOn();
assertBackgroundNetworkAccess(true);
}
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 47ab9fa..406b1d8 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
@@ -49,8 +49,6 @@
import android.text.TextUtils;
import android.util.Log;
-import com.android.cts.net.hostside.INetworkStateObserver;
-
/**
* Superclass for tests related to background network restrictions.
*/
@@ -150,6 +148,7 @@
@Override
protected void tearDown() throws Exception {
+ batteryReset();
if (!mIsLocationOn) {
disableLocation();
}
@@ -809,15 +808,18 @@
assertPowerSaveModeExceptIdleWhitelist(packageName, false); // Sanity check
}
- protected void turnBatteryOff() throws Exception {
+ protected void turnBatteryOn() throws Exception {
executeSilentShellCommand("cmd battery unplug");
assertBatteryState(false);
}
- protected void turnBatteryOn() throws Exception {
- executeSilentShellCommand("cmd battery reset");
+ protected void turnBatteryOff() throws Exception {
+ executeSilentShellCommand("cmd battery set ac " + BatteryManager.BATTERY_PLUGGED_AC);
assertBatteryState(true);
+ }
+ private void batteryReset() throws Exception {
+ executeSilentShellCommand("cmd battery reset");
}
private void assertBatteryState(boolean pluggedIn) throws Exception {
@@ -848,11 +850,11 @@
protected void setBatterySaverMode(boolean enabled) throws Exception {
Log.i(TAG, "Setting Battery Saver Mode to " + enabled);
if (enabled) {
- turnBatteryOff();
+ turnBatteryOn();
executeSilentShellCommand("cmd power set-mode 1");
} else {
executeSilentShellCommand("cmd power set-mode 0");
- turnBatteryOn();
+ turnBatteryOff();
}
}
@@ -862,12 +864,12 @@
Log.i(TAG, "Setting Doze Mode to " + enabled);
if (enabled) {
- turnBatteryOff();
+ turnBatteryOn();
turnScreenOff();
executeShellCommand("dumpsys deviceidle force-idle deep");
} else {
turnScreenOn();
- turnBatteryOn();
+ turnBatteryOff();
executeShellCommand("dumpsys deviceidle unforce");
}
// Sanity check.