mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-17 11:54:26 -05:00
9efddf820f
ce7b9fd0f5d39bbaa57edf49ae67f1a0afe17e81cb2db1244c93a2c9a876ed52683e9c09e6330796Signed-off-by: Tavi <tavi@divested.dev>
26 lines
1.6 KiB
Diff
26 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Dmitry Muhomor <muhomor.dmitry@gmail.com>
|
|
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);
|