commit 5b65be96ab061cbdba479795ff467c0eab92c28a
author Amith Yamasani <yamasani@google.com> Thu Jul 09 00:47:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 09 00:47:08 2015 +0000
tree 43dfb930448fc6e80b6e08646a53f33762b5e86c
parent 569a271f0c32a66b33f305e5181c7687b6303aa5
parent 370c27c7fe308e351d375295d422df76f7ede164

am 370c27c7: am 705ba960: Merge "Qualify the uid with the userId when granting permissions" into mnc-dev

* commit '370c27c7fe308e351d375295d422df76f7ede164':
  Qualify the uid with the userId when granting permissions

services/core/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 124214c..fb0054f 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -3383,7 +3383,7 @@
 
             enforceDeclaredAsUsedAndRuntimePermission(pkg, bp);
 
-            uid = pkg.applicationInfo.uid;
+            uid = UserHandle.getUid(userId, pkg.applicationInfo.uid);
             sb = (SettingBase) pkg.mExtras;
             if (sb == null) {
                 throw new IllegalArgumentException("Unknown package: " + packageName);