tree ff6f77e5e7245f7321cc67a4f185e195d5dd6122
parent fff671d6605da699b8ac27446acd295a39a38af0
parent a8c0e350fe9b9b61079d5ea2a44d949874f4b493
author Jing Ji <jji@google.com> 1634777465 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1634777465 +0000

Merge "Fix potential race condition due to missing lock" am: 8787386e84 am: af33aac24e am: a8c0e350fe

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

Change-Id: If8c420e6daf779940c9e700796e1594eb4bc96ec