Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7042703 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

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

am: 22b5de0e

Change-Id: I3ce7fdc8c2b7f9e62eff0ed64ca2f6a022fbd4b9
parents a60bb107 22b5de0e

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -2334,6 +2334,11 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
            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;