Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da47f1d5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 5e83086a a7a47eb5

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

+0 −7
Original line number Diff line number Diff line
@@ -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