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

Commit a7a47eb5 authored by Hai Zhang's avatar Hai Zhang Committed by Android (Google) Code Review
Browse files

Revert "[permission] Debugging access state concurrency" 

This reverts commit a4822a17.

Reason for revert: Not for release in 25Q2

Change-Id: If7e9f032627eaa52562499245c64866023cddd72
parent a4822a17

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

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