summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nicolas Prevot <nprevot@google.com> 2014-08-20 11:03:03 +0100
committer Nicolas Prevot <nprevot@google.com> 2014-08-20 11:09:29 +0100
commit5ef7e19a0e1656a7dc6af8cf785d75ddc319cd8c (patch)
treef48c1208369408710b75db30b5fc59d6778f4040
parent5e85359a36c14c0c568b73f138f6c8f4baad9b8e (diff)
Allow the system in other users to call startActivityAsCaller.
BUG: 17148852 Change-Id: I4c9811b7da90b5705e72001dd36bf67d559cb189
-rwxr-xr-xservices/core/java/com/android/server/am/ActivityManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 9162b3dcd0bf..1053f130357e 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -3461,7 +3461,7 @@ public final class ActivityManagerService extends ActivityManagerNative
if (sourceRecord.app == null) {
throw new SecurityException("Called without a process attached to activity");
}
- if (sourceRecord.app.uid != Process.SYSTEM_UID) {
+ if (UserHandle.getAppId(sourceRecord.app.uid) != Process.SYSTEM_UID) {
// This is still okay, as long as this activity is running under the
// uid of the original calling activity.
if (sourceRecord.app.uid != sourceRecord.launchedFromUid) {