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

Commit a420ed9f authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Abort PRE_BOOT dispatch when user is stopped." into nyc-dev 

am: 2b05239a

* commit '2b05239a':
  Abort PRE_BOOT dispatch when user is stopped.

Change-Id: I94e99e7740af29b6f445dd3b146335674ee58a5b
parents 2f737b53 2b05239a

services/core/java/com/android/server/am/PreBootBroadcaster.java

+6 −0
Original line number Diff line number Diff line
@@ -69,6 +69,12 @@ public abstract class PreBootBroadcaster extends IIntentReceiver.Stub { 
            return;

        }



        if (!mService.isUserRunning(mUserId, 0)) {

            Slog.i(TAG, "User " + mUserId + " is no longer running; skipping remaining receivers");

            onFinished();

            return;

        }



        final ResolveInfo ri = mTargets.get(mIndex++);

        final ComponentName componentName = ri.activityInfo.getComponentName();