tree b62e516153189d7f88c9d8a7653a9c2b88f1a0a2
parent 82a84c8c8d8eb884cab6e01bfa27391a28163f0b
parent 773a3783902e531c6826ac8f9ac53506c07a9be2
author Max Bires <jbires@google.com> 1629252417 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629252417 +0000

Merge "Fixing a condition that can cause deadlock" am: 773a378390

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1797475

Change-Id: Id20947de8b039d4a468127a446266c30fbbd1659