Merge "Revert "[permission] Debugging access state concurrency"" into main

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 662e0c06f261..cfaf31743a78 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
@@ -1751,13 +1751,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