tree 7a6bcc4cb9c7bcd796a17382839659742834d6b4
parent c8274e46ebdb4cb9ed18f10f2fc7346e88953580
parent 89abfb36eb962db2c5e3c60b29999121d1b9c30f
author Simon Bowden <sbowden@google.com> 1628181476 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628181476 +0000

Merge "Fix a race condition between calculateWaitTime and actually waiting. When the race was lost with a completion callback, the operation being waited upon may have been de-queued by the completion callback for immediate execution, but the thread was still proceeding with the wait." into sc-dev am: 47fc76e4f2 am: 89abfb36eb

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

Change-Id: Ic7119af120f9c4b89ffa750a8ef8a7c66b284066