Revert "wait-for-broadcast-idle before stopUser in UserLifecycleTests."
This reverts commit dde7a3317310f4fc5be726cde168573346240502.
Reason for revert: b/240771273
Change-Id: Id2e83efde04ef6e124f91854d8828e99ba9bb745
diff --git a/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java b/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java
index 40a3c92..448ee61 100644
--- a/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java
+++ b/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java
@@ -316,8 +316,6 @@
mIam.startUserInBackground(userId);
}, Intent.ACTION_USER_STARTED, Intent.ACTION_MEDIA_MOUNTED);
- waitForBroadcastIdle();
-
mRunner.resumeTiming();
Log.i(TAG, "Starting timer");
@@ -680,8 +678,6 @@
}
private void stopUser(int userId, boolean force) throws RemoteException {
- waitForBroadcastIdle();
-
final CountDownLatch latch = new CountDownLatch(1);
mIam.stopUser(userId, force /* force */, new IStopUserCallback.Stub() {
@Override
@@ -886,8 +882,4 @@
assertEquals("", ShellHelper.runShellCommand("setprop " + name + " " + value));
return oldValue;
}
-
- private void waitForBroadcastIdle() {
- ShellHelper.runShellCommand("am wait-for-broadcast-idle");
- }
}