Merge "Disable battery saver at the end of the test run." into main

2023-07-14 18:49:05 +00:00
parent 73a61abe1a 7261422eab
commit 472d72f7da
1 changed files with 12 additions and 8 deletions
--- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/RestrictedModeTest.java
+++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/RestrictedModeTest.java
@@ -57,6 +57,7 @@ public final class RestrictedModeTest extends AbstractRestrictBackgroundNetworkT
    @Test
    public void testNetworkAccess_withBatterySaver() throws Exception {
        setBatterySaverMode(true);
+        try {
            addPowerSaveModeWhitelist(TEST_APP2_PKG);
            assertBackgroundNetworkAccess(true);

@@ -66,5 +67,8 @@ public final class RestrictedModeTest extends AbstractRestrictBackgroundNetworkT
            setRestrictedNetworkingMode(false);
            // Given that Restricted mode is turned off, app should be able to access network again.
            assertBackgroundNetworkAccess(true);
+        } finally {
+            setBatterySaverMode(false);
+        }
    }
 }