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>
This commit is contained in:
Hai Zhang
2023-06-02 03:42:11 +00:00
committed by Automerger Merge Worker

View File

@@ -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)) {