Merge "Report all permissions for user in PermissionsState"

2015-04-20 20:10:31 +00:00
parent 5f24126e2e 7aa6dfeb01
commit 7a0fe44d6a
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/PermissionsState.java
+++ b/services/core/java/com/android/server/pm/PermissionsState.java
@@ -290,7 +290,9 @@ public final class PermissionsState {
                    permissions.add(permission);
                }
            } else {
-                if (hasRuntimePermission(permission, userId)) {
+                if (hasInstallPermission(permission)) {
+                    permissions.add(permission);
+                } else if (hasRuntimePermission(permission, userId)) {
                    permissions.add(permission);
                }
            }