Merge "Do not trigger revoke-perm callbacks if no change" into qt-dev

am: 5401046356 Change-Id: I533fef1faac229a77cd38f40d4ccaeac83abc84f
2019-07-08 13:13:00 -07:00
parent d6872017f4 5401046356
commit 98497a96ae
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -2269,6 +2269,11 @@ public class PermissionManagerService {
            return;
        }

+        // Permission is already revoked, no need to do anything.
+        if (!permissionsState.hasRuntimePermission(permName, userId)) {
+            return;
+        }
+
        if (permissionsState.revokeRuntimePermission(bp, userId) ==
                PERMISSION_OPERATION_FAILURE) {
            return;