From f79d59a7cb820bf7b420b34b57795f502edf27da Mon Sep 17 00:00:00 2001 From: Yasin Kilicdere Date: Thu, 4 Aug 2022 14:28:41 +0000 Subject: [PATCH] Revert "wait-for-broadcast-idle before stopUser in UserLifecycleTests." This reverts commit dde7a3317310f4fc5be726cde168573346240502. Reason for revert: b/240771273 Change-Id: Id2e83efde04ef6e124f91854d8828e99ba9bb745 --- .../src/android/multiuser/UserLifecycleTests.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java b/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java index 40a3c92925745..448ee6160ce08 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 @@ public class UserLifecycleTests { mIam.startUserInBackground(userId); }, Intent.ACTION_USER_STARTED, Intent.ACTION_MEDIA_MOUNTED); - waitForBroadcastIdle(); - mRunner.resumeTiming(); Log.i(TAG, "Starting timer"); @@ -680,8 +678,6 @@ public class UserLifecycleTests { } 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 @@ public class UserLifecycleTests { assertEquals("", ShellHelper.runShellCommand("setprop " + name + " " + value)); return oldValue; } - - private void waitForBroadcastIdle() { - ShellHelper.runShellCommand("am wait-for-broadcast-idle"); - } }