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

View File

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