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

Commit d7b5b6ba authored by Song Chun Fan's avatar Song Chun Fan Committed by Android (Google) Code Review
Browse files

Merge "Add a userId to BOOT_COMPLETED in BroadcastHelper" into main

parents 77e00b7e c98d6548

services/core/java/com/android/server/pm/BroadcastHelper.java

+2 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ public final class BroadcastHelper { 
            // Deliver LOCKED_BOOT_COMPLETED first

            Intent lockedBcIntent = new Intent(Intent.ACTION_LOCKED_BOOT_COMPLETED)

                    .setPackage(packageName);

            lockedBcIntent.putExtra(Intent.EXTRA_USER_HANDLE, userId);

            if (includeStopped) {

                lockedBcIntent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);

            }
@@ -275,6 +276,7 @@ public final class BroadcastHelper { 
            // Deliver BOOT_COMPLETED only if user is unlocked

            if (mUmInternal.isUserUnlockingOrUnlocked(userId)) {

                Intent bcIntent = new Intent(Intent.ACTION_BOOT_COMPLETED).setPackage(packageName);

                bcIntent.putExtra(Intent.EXTRA_USER_HANDLE, userId);

                if (includeStopped) {

                    bcIntent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);

                }