Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Fix wrong permission state changed being notified"" am: f66d53b5ce

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2619789

Change-Id: I4c20fe30c2576794f63b94719ea86af04165aead
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hai Zhang
2023-06-08 19:05:30 +00:00
committed by Automerger Merge Worker
parent 17b3833ce0 f66d53b5ce
commit d2ff273259
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
View File

@@ -2868,7 +2868,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
} else if (!permissionPolicyInitialized } else if (!permissionPolicyInitialized
|| (!hardRestricted || restrictionExempt)) { || (!hardRestricted || restrictionExempt)) {
if ((origPermState != null && origPermState.isGranted())) { if ((origPermState != null && origPermState.isGranted())) {
uidState.grantPermission(bp); if (!uidState.grantPermission(bp)) {
wasChanged = true;
}
} }
} }
if (mIsLeanback && NOTIFICATION_PERMISSIONS.contains(permName)) { if (mIsLeanback && NOTIFICATION_PERMISSIONS.contains(permName)) {