summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hai Zhang <zhanghai@google.com> 2023-06-02 02:20:10 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-06-02 02:20:10 +0000
commitab62c6d546427601c73ad30b1aef22e094f0cbf3 (patch)
tree9c008c2d223d90612079d5f466d257eef71fe254
parent20d546c0885670d2f25419c6c7c3a0cac18cc230 (diff)
parent50430804ef1ec804b1576e8048ab21894365d2a2 (diff)
Merge "Fix wrong permission state changed being notified"
-rw-r--r--services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java4
1 files changed, 1 insertions, 3 deletions
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 554e2690b878..b92e73c49367 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
@@ -2868,9 +2868,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
} else if (!permissionPolicyInitialized
|| (!hardRestricted || restrictionExempt)) {
if ((origPermState != null && origPermState.isGranted())) {
- if (!uidState.grantPermission(bp)) {
- wasChanged = true;
- }
+ uidState.grantPermission(bp);
}
}
if (mIsLeanback && NOTIFICATION_PERMISSIONS.contains(permName)) {