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""

Browse Source
This commit is contained in:
Hai Zhang
2023-06-08 18:30:19 +00:00
committed by Gerrit Code Review
parent 933a0c09f8 2ae505dd6b
commit f66d53b5ce
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)) {