diff options
| author | 2023-06-02 02:58:35 +0000 | |
|---|---|---|
| committer | 2023-06-02 02:58:35 +0000 | |
| commit | 3cb7b3bbcd81f256d38b5ad98a2c46ef49e1a128 (patch) | |
| tree | 3eb8f6f2357046ba3c7e62dcdfc5a8d870f9eba9 | |
| parent | 3bb836d92700e3d2adb6a56225e0e54bfe39900f (diff) | |
| parent | ab62c6d546427601c73ad30b1aef22e094f0cbf3 (diff) | |
Merge "Fix wrong permission state changed being notified" am: ab62c6d546
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2612429
Change-Id: Ib725ba8b8009b84535bb9612a0ea988f2b3bea20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java | 4 |
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 9ed5aa7158ab..cbc27c94bc68 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)) { |