| commit | defd1aa6fd75ae572b2d9860b1ebc46bab905339 | [log] [tgz] |
|---|---|---|
| author | Kweku Adams <kwekua@google.com> | Fri Jul 10 11:27:38 2020 -0700 |
| committer | Kweku Adams <kwekua@google.com> | Fri Jul 10 20:49:41 2020 +0000 |
| tree | c54b3eaa14bcbedc636d7da9efcc7a957e97db2a | |
| parent | e966fa5f32b36f4b7024d6ee528f5b50b540d7c8 [diff] |
Ensure battery saving modes are disabled. Syncs will be deferred if battery saver's forceAllAppStandby toggle is enabled, so make sure both adaptive and full battery saver are disabled for the test. Bug: 160295401 Test: atest CtsSyncManagerTestsCases Change-Id: I080f7d65234332405852c56f9a205e6c9d7df4a7 (cherry picked from commit 87b2260431d68549aa8eced496063e0981d92b9f)
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/BatteryUtils.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/BatteryUtils.java index 4ad538c..955321a 100644 --- a/common/device-side/util-axt/src/com/android/compatibility/common/util/BatteryUtils.java +++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/BatteryUtils.java
@@ -76,6 +76,12 @@ Log.d(TAG, "Battery RESET"); } + public static void enableAdaptiveBatterySaver(boolean enabled) { + final String setting = enabled ? "true" : "false"; + SystemUtil.runShellCommandForNoOutput( + "cmd power set-adaptive-power-saver-enabled " + setting); + } + /** * Enable / disable battery saver. Note {@link #runDumpsysBatteryUnplug} must have been * executed before enabling BS.
diff --git a/tests/tests/syncmanager/src/android/content/syncmanager/cts/CtsSyncManagerTest.java b/tests/tests/syncmanager/src/android/content/syncmanager/cts/CtsSyncManagerTest.java index 2d4a90c..0aa79ec 100644 --- a/tests/tests/syncmanager/src/android/content/syncmanager/cts/CtsSyncManagerTest.java +++ b/tests/tests/syncmanager/src/android/content/syncmanager/cts/CtsSyncManagerTest.java
@@ -95,6 +95,8 @@ assertNetworkConnected(InstrumentationRegistry.getContext()); BatteryUtils.runDumpsysBatteryUnplug(); + BatteryUtils.enableAdaptiveBatterySaver(false); + BatteryUtils.enableBatterySaver(false); AmUtils.setStandbyBucket(APP1_PACKAGE, UsageStatsManager.STANDBY_BUCKET_ACTIVE);