summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2015-07-08 23:44:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-08 23:44:55 +0000
commit705ba9606325df6575d171ee96811d215e69b4e8 (patch)
treed70204ab1bd49c79adc07c642d9814dfa18bd471
parentdad62b9f993b95bb9a0c20d29c69d35bd7531008 (diff)
parent6b53c162102e2a4b3d745fcceb1224cc94860b64 (diff)
downloadframeworks_base-705ba9606325df6575d171ee96811d215e69b4e8.zip
frameworks_base-705ba9606325df6575d171ee96811d215e69b4e8.tar.gz
frameworks_base-705ba9606325df6575d171ee96811d215e69b4e8.tar.bz2
Merge "Qualify the uid with the userId when granting permissions" into mnc-dev
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java2
1 files changed, 1 insertions, 1 deletions
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 @@ public class PackageManagerService extends IPackageManager.Stub {
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);