Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1e1516e authored by Yasin Kilicdere's avatar Yasin Kilicdere Committed by Automerger Merge Worker
Browse files

Merge "Add timeout to waitForBroadcastIdle in UserLifecycleTests." into udc-dev am: 393f7b0e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22849718



Change-Id: Ia1da77b6ca1a79512947598ef81b5f2db8fbbd86
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8c1fae5f 393f7b0e

apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java

+5 −1
Original line number Diff line number Diff line
@@ -1538,7 +1538,11 @@ public class UserLifecycleTests { 
    }



    private void waitForBroadcastIdle() {

        ShellHelper.runShellCommand("am wait-for-broadcast-idle");

        try {

            runShellCommandWithTimeout("am wait-for-broadcast-idle", TIMEOUT_IN_SECOND);

        } catch (TimeoutException e) {

            Log.e(TAG, "Ending waitForBroadcastIdle because it is taking too long", e);

        }

    }



    private void sleep(long ms) {