Correct check of is user running
Before the ActivityManagerService sends an intent or starts an activity it checks if target user is in mStartedUsers array. When removing a non-owner user process the UserStartedState instance will still be in mStartedUsers array with mState STOPPING or SHUTDOWN. This should be checked before sending an intent or start an activity. isUserRunningLocked(...) will interpret mState STOPPING and SHUTDOWN as a non running user. Change-Id: I1b51bcdb62bdd0f6dbe05dab4d529d4ad40d0d44
This commit is contained in:
committed by
Henrik Baard
parent
a58336f6c8
commit
9edcc7be49
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user