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

Merge "Update the BroadcastQueue logic for runtime permissions" into sc-v2-dev am: 1c6635fe76

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

Change-Id: Iea5ce7f319208a11c3f8a766bf8cabf2ea6e3a3b
This commit is contained in:
TreeHugger Robot
2021-10-15 15:47:45 +00:00
committed by Automerger Merge Worker
parent 9838857545 1c6635fe76
commit b7c2ca6896
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/am/BroadcastQueue.java
View File

@@ -1568,17 +1568,23 @@ public final class BroadcastQueue {
perm = PackageManager.PERMISSION_DENIED;
}
if (perm == PackageManager.PERMISSION_GRANTED) {
skip = true;
break;
}
int appOp = AppOpsManager.permissionToOpCode(excludedPermission);
if (appOp != AppOpsManager.OP_NONE) {
if (mService.getAppOpsManager().checkOpNoThrow(appOp,
// When there is an app op associated with the permission,
// skip when both the permission and the app op are
// granted.
if ((perm == PackageManager.PERMISSION_GRANTED) && (
mService.getAppOpsManager().checkOpNoThrow(appOp,
info.activityInfo.applicationInfo.uid,
info.activityInfo.packageName)
== AppOpsManager.MODE_ALLOWED) {
== AppOpsManager.MODE_ALLOWED)) {
skip = true;
break;
}
} else {
// When there is no app op associated with the permission,
// skip when permission is granted.
if (perm == PackageManager.PERMISSION_GRANTED) {
skip = true;
break;
}