am 43606641: Merge "Correct check of is user running" into lmp-mr1-dev (50734b70) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -9293,9 +9293,9 @@ public final class ActivityManagerService extends ActivityManagerNative
	"Attempt to launch content provider before system ready");		"Attempt to launch content provider before system ready");
	}		}

	// Make sure that the user who owns this provider is started. If not,		// Make sure that the user who owns this provider is running. If not,
	// we don't want to allow it to run.		// we don't want to allow it to run.
	if (mStartedUsers.get(userId) == null) {		if (!isUserRunningLocked(userId, false)) {
	Slog.w(TAG, "Unable to launch app "		Slog.w(TAG, "Unable to launch app "
	+ cpi.applicationInfo.packageName + "/"		+ cpi.applicationInfo.packageName + "/"
	+ cpi.applicationInfo.uid + " for provider "		+ cpi.applicationInfo.uid + " for provider "
	@@ -15660,10 +15660,10 @@ public final class ActivityManagerService extends ActivityManagerNative
	userId = handleIncomingUser(callingPid, callingUid, userId,		userId = handleIncomingUser(callingPid, callingUid, userId,
	true, ALLOW_NON_FULL, "broadcast", callerPackage);		true, ALLOW_NON_FULL, "broadcast", callerPackage);

	// Make sure that the user who is receiving this broadcast is started.		// Make sure that the user who is receiving this broadcast is running.
	// If not, we will just skip it.		// If not, we will just skip it.

	if (userId != UserHandle.USER_ALL && mStartedUsers.get(userId) == null) {		if (userId != UserHandle.USER_ALL && !isUserRunningLocked(userId, false)) {
	if (callingUid != Process.SYSTEM_UID \|\| (intent.getFlags()		if (callingUid != Process.SYSTEM_UID \|\| (intent.getFlags()
	& Intent.FLAG_RECEIVER_BOOT_UPGRADE) == 0) {		& Intent.FLAG_RECEIVER_BOOT_UPGRADE) == 0) {
	Slog.w(TAG, "Skipping broadcast of " + intent		Slog.w(TAG, "Skipping broadcast of " + intent