From 89cfdfe951517df1468bf1b3347a051e33fef17d Mon Sep 17 00:00:00 2001
From: Manjeet Rulhania <mrulhania@google.com>
Date: Tue, 7 Mar 2023 23:55:56 +0000
Subject: 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
---
 .../com/android/permissioncontroller/permission/utils/KotlinUtils.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'PermissionController/src/com/android/permissioncontroller/permission/utils')

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 {
-- 
cgit v1.2.3