tree be2d56d8d9d96ab31086c8eabe04026f36795abc
parent fe7b493edd5772eb55823d3454ade276a0ada160
author Chuck Jazdzewski <chuckj@google.com> 1680815288 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1681142072 +0000

Fix potential deadlock in snapshot list and map

Adding content to a SnapshotStateList or SnapshotStateMap can
encounter a deadlock if the modification is concurrent with
a direct write to the state record. This was made signficantly
more likely to be encountered  with the changes introduced by
93fcae828b that uses direct writes to release unused records.

The locks are now ordered in that a snapshot lock is never
attempted to be taken when a map or list lock is held.

Fixes: 269402895
Test: ./gradlew :composer:r:r:tDUT
(cherry picked from https://android-review.googlesource.com/q/commit:5e7f64d97283fb2be1db3f0d5c6dcd1a55c1a425)
Merged-In: Ie8b87caecabc88f6a6dd610805d964aed3489b85
Change-Id: Ie8b87caecabc88f6a6dd610805d964aed3489b85