commit d26bfec44bc7537ba1697af44562a51912d1c8f7
author Nicolas Prevot <nprevot@google.com> Wed Aug 20 16:55:38 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Aug 16 04:36:37 2014 +0000
tree 1a53c74ae8d8ef8a1f1a989c973711a77cd58ac2
parent 7fa31601a6e970856d0e9cf73d1ece0dcd66ef6f
parent 5ef7e19a0e1656a7dc6af8cf785d75ddc319cd8c

Merge "Allow the system in other users to call startActivityAsCaller." into lmp-dev

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 05179a4..b1d84f58 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -3463,7 +3463,7 @@
             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) {