Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correct check of is user running"

Browse Source
This commit is contained in:
Amith Yamasani
2014-12-04 23:09:46 +00:00
committed by Gerrit Code Review
parent 448403b7a4 9edcc7be49
commit d234dc1f20
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -9394,9 +9394,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 "
@@ -15463,10 +15463,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