Use the correct userId when checking if disabled by admin.

Change-Id: I0fbe8ac8670b9fa4eb1fa35693856b47fdc974a4

2 files changed, 8 insertions, 0 deletions

diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
index 2d28987d..27cbcd64 100644
--- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
+++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
@@ -285,6 +285,10 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
         return mDescription;
     }
 
+    public int getUserId() {
+        return mUserHandle.getIdentifier();
+    }
+
     public boolean hasPermission(String permission) {
         return mPermissions.get(permission) != null;
     }
diff --git a/src/com/android/packageinstaller/permission/model/PermissionApps.java b/src/com/android/packageinstaller/permission/model/PermissionApps.java
index 36b4ee8a..e9eaff5d 100644
--- a/src/com/android/packageinstaller/permission/model/PermissionApps.java
+++ b/src/com/android/packageinstaller/permission/model/PermissionApps.java
@@ -345,6 +345,10 @@ public class PermissionApps {
             return mAppPermissionGroup.hasRuntimePermission();
         }
 
+        public int getUserId() {
+            return mAppPermissionGroup.getUserId();
+        }
+
         public String getPackageName() {
             return mPackageName;
         }