tree d0dc6c656489f396baa3d26cc73d87b17960f0b1
parent 8967e85cf486784af7f737a7a7dfca49a24a3345
parent 01221cb71625d2dc095e02a97554ca13b64c76ec
author Hai Zhang <zhanghai@google.com> 1646269035 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1646269035 +0000

Merge changes from topics "presubmit-am-4fce8d22f6ba4533875ba6f9fcf0183b", "presubmit-am-748689f93ea9431ca216195bbc7d9588" into tm-dev

* changes:
  Fix potential deadlock in restorePermissionState().
  Properly fix revokePermissionsNoLongerImplicitLocked() for shared UIDs.