diff options
| author | 2023-06-02 03:42:11 +0000 | |
|---|---|---|
| committer | 2023-06-02 03:42:11 +0000 | |
| commit | 9deb015ef67ee273d055e4837ed3ed802d12a20f (patch) | |
| tree | 1b24fa2db464b50d6646a5ef9381c91abbe2a2b5 | |
| parent | 423590351ca53e2feff9b97274075e4bb825800d (diff) | |
| parent | 3cb7b3bbcd81f256d38b5ad98a2c46ef49e1a128 (diff) | |
Merge "Fix wrong permission state changed being notified" am: ab62c6d546 am: 3cb7b3bbcd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2612429
Change-Id: I877ec188ec3e865f23df311be6707392e8ff721a
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 8dadd3190ac3..d980ef8feaf2 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -2894,9 +2894,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)) { |