summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManjeet Rulhania <mrulhania@google.com>2023-03-07 23:55:56 +0000
committerManjeet Rulhania <mrulhania@google.com>2023-03-08 05:22:00 +0000
commit89cfdfe951517df1468bf1b3347a051e33fef17d (patch)
treeb5b47a3d2fe3523b5b66bcfe34a1ddc458205327
parentb8bf87e868322bbcb121bf7fe0d4f30bbda4ffac (diff)
downloadPermission-89cfdfe951517df1468bf1b3347a051e33fef17d.tar.gz
Fix allow app-op for multiple foreground permissions
Change-Id: I48d0c387c11f5501e17c2a83019aefd85e88a47c Relnote: N/A Fix: 272129392 Test: build (cherry picked from commit 88b206135d3341e5e78db0e878bb061ea6863627) Change-Id: I19cfec3429cb843a293aa2e1282c9a21a7570d74 Merged-In: I48d0c387c11f5501e17c2a83019aefd85e88a47c
-rw-r--r--PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt4
1 files changed, 2 insertions, 2 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt b/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt
index 82ad2494b..3ab0a83fc 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt
@@ -976,8 +976,8 @@ object KotlinUtils {
val appOpName = permissionToOp(foregroundPermName) ?: continue
if (fgPerm != null && fgPerm.isGrantedIncludingAppOp) {
- wasChanged = wasChanged || setOpMode(appOpName, uid, packageName, MODE_ALLOWED,
- appOpsManager)
+ wasChanged = setOpMode(appOpName, uid, packageName, MODE_ALLOWED,
+ appOpsManager) || wasChanged
}
}
} else {