commit 46de7bfccac1ad469c3f59d53e863fa3a2cbac65
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jul 04 04:54:24 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 04 04:54:24 2024 +0000
tree efa257e6b3a6884349e5c6fbf10491e0cfb77c7c
parent d9ab7027d1d8e651ad215d6629d1f7e52dea8216
parent e9050bbcb7ee43cc6870c054b884a0bace2f156e

Merge "Kill apps when GIDs changed instead of only when added" into main

services/permission/java/com/android/server/permission/access/permission/PermissionService.kt

diff --git a/services/permission/java/com/android/server/permission/access/permission/PermissionService.kt b/services/permission/java/com/android/server/permission/access/permission/PermissionService.kt
index 78dbc60..0b7438c 100644
--- a/services/permission/java/com/android/server/permission/access/permission/PermissionService.kt
+++ b/services/permission/java/com/android/server/permission/access/permission/PermissionService.kt
@@ -2687,7 +2687,7 @@
                 runtimePermissionChangedUidDevices.getOrPut(uid) { mutableSetOf() } += deviceId
             }
 
-            if (permission.hasGids && !wasPermissionGranted && isPermissionGranted) {
+            if (permission.hasGids && (wasPermissionGranted != isPermissionGranted)) {
                 gidsChangedUids += uid
             }
         }