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 am: d2ff273259

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

Change-Id: I07db4c9c00ae29a30681fe60bb33f28ae701081a
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:47:23 +00:00
committed by Automerger Merge Worker
parent 3d1eb8b5b6 d2ff273259
commit aeb0489342
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

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