Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Wait for broadcast idle before runThenWaits containing resumeTiming."

Browse Source
This commit is contained in:
Yasin Kilicdere
2022-08-26 22:32:58 +00:00
committed by Android (Google) Code Review
parent 60e04f428b f02cec7434
commit d44f580e9b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java
View File

@@ -208,6 +208,8 @@ public class UserLifecycleTests {
while (mRunner.keepRunning()) {
mRunner.pauseTiming();
final int userId = createUserNoFlags();
waitForBroadcastIdle();
runThenWaitForBroadcasts(userId, () -> {
mRunner.resumeTiming();
Log.i(TAG, "Starting timer");
@@ -335,6 +337,7 @@ public class UserLifecycleTests {
final int startUser = mAm.getCurrentUser();
final int userId = createUserNoFlags();
waitForBroadcastIdle();
mUserSwitchWaiter.runThenWaitUntilBootCompleted(userId, () -> {
mRunner.resumeTiming();
Log.i(TAG, "Starting timer");
@@ -360,6 +363,7 @@ public class UserLifecycleTests {
switchUser(userId);
}, Intent.ACTION_MEDIA_MOUNTED);
waitForBroadcastIdle();
mUserSwitchWaiter.runThenWaitUntilSwitchCompleted(startUser, () -> {
runThenWaitForBroadcasts(userId, () -> {
mRunner.resumeTiming();
@@ -685,7 +689,7 @@ public class UserLifecycleTests {
*/
private void stopUserAfterWaitingForBroadcastIdle(int userId, boolean force)
throws RemoteException {
ShellHelper.runShellCommand("am wait-for-broadcast-idle");
waitForBroadcastIdle();
stopUser(userId, force);
}
@@ -894,4 +898,8 @@ public class UserLifecycleTests {
assertEquals("", ShellHelper.runShellCommand("setprop " + name + " " + value));
return oldValue;
}
private void waitForBroadcastIdle() {
ShellHelper.runShellCommand("am wait-for-broadcast-idle");
}
}