diff options
| -rwxr-xr-x | services/core/java/com/android/server/am/ActivityManagerService.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 8dfb3217c0af..a2165cdd4066 100755 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -9372,9 +9372,9 @@ public final class ActivityManagerService extends ActivityManagerNative "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. - if (mStartedUsers.get(userId) == null) { + if (!isUserRunningLocked(userId, false)) { Slog.w(TAG, "Unable to launch app " + cpi.applicationInfo.packageName + "/" + cpi.applicationInfo.uid + " for provider " @@ -15440,10 +15440,10 @@ public final class ActivityManagerService extends ActivityManagerNative userId = handleIncomingUser(callingPid, callingUid, userId, 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 (userId != UserHandle.USER_ALL && mStartedUsers.get(userId) == null) { + if (userId != UserHandle.USER_ALL && !isUserRunningLocked(userId, false)) { if (callingUid != Process.SYSTEM_UID || (intent.getFlags() & Intent.FLAG_RECEIVER_BOOT_UPGRADE) == 0) { Slog.w(TAG, "Skipping broadcast of " + intent |