Merge "Do not trigger revoke-perm callbacks if no change" into qt-dev (54010463) · Commits · e / os / android_frameworks_base

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2269,6 +2269,11 @@ public class PermissionManagerService {
	return;		return;
	}		}

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

	if (permissionsState.revokeRuntimePermission(bp, userId) ==		if (permissionsState.revokeRuntimePermission(bp, userId) ==
	PERMISSION_OPERATION_FAILURE) {		PERMISSION_OPERATION_FAILURE) {
	return;		return;