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

* commit '705ba9606325df6575d171ee96811d215e69b4e8':
  Qualify the uid with the userId when granting permissions

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 124214c84b5f..fb0054fa3fa2 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);