diff options
| author | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2023-03-08 05:22:16 +0000 |
|---|---|---|
| committer | Manjeet Rulhania <mrulhania@google.com> | 2023-03-08 22:10:56 +0000 |
| commit | 310047895768a56af730138c360a7ee9b7e0bb19 (patch) | |
| tree | d37c8125e210a6b3c711fcee90cf12e1d0607844 /PermissionController/src/com/android/permissioncontroller/permission/utils | |
| parent | 8fc7026586356a82a9ff985d894e293e011120c1 (diff) | |
| parent | 89cfdfe951517df1468bf1b3347a051e33fef17d (diff) | |
| download | Permission-310047895768a56af730138c360a7ee9b7e0bb19.tar.gz | |
[automerge] Fix allow app-op for multiple foreground permissions 2p: 89cfdfe951
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/21898501
Fix: 272129392
Change-Id: I4d5c7340e1dd2f3db6f0ace629ddc1cac745a603
Merged-In: I48d0c387c11f5501e17c2a83019aefd85e88a47c
Diffstat (limited to 'PermissionController/src/com/android/permissioncontroller/permission/utils')
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt | 4 |
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 1b6c1d10b..29d511f00 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt @@ -1240,8 +1240,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 { |