Move disabling battery saver to the base class
This way all battery tests will clean up after
themselves.
Bug: 135759873
Test: CtsBatterySavingTestCases
Change-Id: I3be01aa2df5e07b3c3fa31dbf32b05371ec3ebc6
Signed-off-by: Roman Kiryanov <rkir@google.com>
(cherry picked from commit c027c3457e58ae1f954613c6f1918ab87139c5b0)
diff --git a/tests/tests/batterysaving/src/android/os/cts/batterysaving/BatterySaverBgServiceTest.java b/tests/tests/batterysaving/src/android/os/cts/batterysaving/BatterySaverBgServiceTest.java
index 0ac98d2..3df0dd2 100644
--- a/tests/tests/batterysaving/src/android/os/cts/batterysaving/BatterySaverBgServiceTest.java
+++ b/tests/tests/batterysaving/src/android/os/cts/batterysaving/BatterySaverBgServiceTest.java
@@ -35,7 +35,6 @@
import androidx.test.filters.MediumTest;
import androidx.test.runner.AndroidJUnit4;
-import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -51,11 +50,6 @@
public class BatterySaverBgServiceTest extends BatterySavingTestBase {
private static final String TAG = "BatterySaverBgServiceTest";
- @After
- public void tearDown() throws Exception {
- enableBatterySaver(false);
- }
-
/**
* Make sure BG services on pre-O apps can't be started when BS is on.
*/
diff --git a/tests/tests/batterysaving/src/android/os/cts/batterysaving/BatterySavingTestBase.java b/tests/tests/batterysaving/src/android/os/cts/batterysaving/BatterySavingTestBase.java
index aaf5de0..e2cf479 100644
--- a/tests/tests/batterysaving/src/android/os/cts/batterysaving/BatterySavingTestBase.java
+++ b/tests/tests/batterysaving/src/android/os/cts/batterysaving/BatterySavingTestBase.java
@@ -15,6 +15,7 @@
*/
package android.os.cts.batterysaving;
+import static com.android.compatibility.common.util.BatteryUtils.enableBatterySaver;
import static com.android.compatibility.common.util.BatteryUtils.runDumpsysBatteryReset;
import static com.android.compatibility.common.util.BatteryUtils.turnOnScreen;
import static com.android.compatibility.common.util.SystemUtil.runCommandAndPrintOnLogcat;
@@ -70,6 +71,7 @@
protected void onAfter(Statement base, Description description) throws Throwable {
runDumpsysBatteryReset();
turnOnScreen(true);
+ enableBatterySaver(false);
}
};
