commit af15ad90c7ca6889bcfd53e92e2dd2f2013e79d6
author Sudheer Shanka <sudheersai@google.com> Wed May 03 23:43:16 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 03 23:43:16 2023 +0000
tree 6c7be9bcdff76db2e284494400b65da9fdbd4ea5
parent ba9d7acde5ce57506873c09568c348ce51c1b726
parent fbf94b9a521ffec966479f4c7cad234d0bb4f10d

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/22988623

Change-Id: If48c07bd57e1dad2c55afb46112a1b5f236c9a63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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 {