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

am: 66c02ffd6d

Change-Id: If43c5f8dcd71f396fa90282eae7a76c76fea9a02

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;