commit fbf94b9a521ffec966479f4c7cad234d0bb4f10d
author Sudheer Shanka <sudheersai@google.com> Wed May 03 23:15:33 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 03 23:15:33 2023 +0000
tree 6c7be9bcdff76db2e284494400b65da9fdbd4ea5
parent 33d8a5305d1eb6ea8f8fae5ea07da8e678edf7ca
parent 5c0d5a5c7671bf46ee1c506a2f0d65d1473706db

Merge "Move the wait-for-barrier command to after the battery state change." into udc-dev

tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java

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 cdfa0d0..106a49c 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
@@ -719,12 +719,13 @@
         Log.i(TAG, "Setting Battery Saver Mode to " + enabled);
         if (enabled) {
             turnBatteryOn();
+            AmUtils.waitForBroadcastBarrier();
             executeSilentShellCommand("cmd power set-mode 1");
         } else {
             executeSilentShellCommand("cmd power set-mode 0");
             turnBatteryOff();
+            AmUtils.waitForBroadcastBarrier();
         }
-        AmUtils.waitForBroadcastBarrier();
     }
 
     protected void setDozeMode(boolean enabled) throws Exception {