From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Fri, 7 Oct 2022 20:12:26 +0300 Subject: [PATCH] srt permissions: don't auto-grant denied ones when permissions are reset --- .../server/pm/permission/PermissionManagerServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java index 4b448f2ddc06..7b4d310c0923 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -1811,7 +1811,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt // If this permission was granted by default or role, make sure it is. if ((oldFlags & FLAG_PERMISSION_GRANTED_BY_DEFAULT) != 0 || (oldFlags & FLAG_PERMISSION_GRANTED_BY_ROLE) != 0 - || isSpecialRuntimePermission(permName)) { + || (isSpecialRuntimePermission(permName) + && checkPermission(packageName, permName, userId) == PERMISSION_GRANTED) + ) { // PermissionPolicyService will handle the app op for runtime permissions later. grantRuntimePermissionInternal(packageName, permName, false, Process.SYSTEM_UID, userId, delayingPermCallback);