summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hai Zhang <zhanghai@google.com> 2025-03-21 14:41:18 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-21 14:41:18 -0700
commita7a47eb55bc83df88df27aa73d09a9d68822433c (patch)
tree61b4b712002ce9c8a574b97c66120e228c29ffcb
parenta4822a1748059d2c6870d1afe3cda13221432fd5 (diff)
Revert "[permission] Debugging access state concurrency"
This reverts commit a4822a1748059d2c6870d1afe3cda13221432fd5. Reason for revert: Not for release in 25Q2 Change-Id: If7e9f032627eaa52562499245c64866023cddd72
-rw-r--r--services/permission/java/com/android/server/permission/access/permission/AppIdPermissionPolicy.kt7
1 files changed, 0 insertions, 7 deletions
diff --git a/services/permission/java/com/android/server/permission/access/permission/AppIdPermissionPolicy.kt b/services/permission/java/com/android/server/permission/access/permission/AppIdPermissionPolicy.kt
index 5a140d53a4d8..232bb83fdf9f 100644
--- a/services/permission/java/com/android/server/permission/access/permission/AppIdPermissionPolicy.kt
+++ b/services/permission/java/com/android/server/permission/access/permission/AppIdPermissionPolicy.kt
@@ -1753,13 +1753,6 @@ class AppIdPermissionPolicy : SchemePolicy() {
}
val appIdPermissionFlags = newState.mutateUserState(userId)!!.mutateAppIdPermissionFlags()
val permissionFlags = appIdPermissionFlags.mutateOrPut(appId) { MutableIndexedMap() }
- // for debugging possible races TODO(b/401768134)
- oldState.userStates[userId]?.appIdPermissionFlags[appId]?.map?.let {
- if (permissionFlags.map === it) {
- throw IllegalStateException("Unexpected sharing between old/new state")
- }
- }
-
permissionFlags.putWithDefault(permissionName, newFlags, 0)
if (permissionFlags.isEmpty()) {
appIdPermissionFlags -= appId