| commit | 95c59ea5cf61947aea095e5ca45b8cab4dcaeb85 | [log] [tgz] |
|---|---|---|
| author | Vlad Popa <pvlad@google.com> | Wed Jun 14 02:23:33 2023 +0200 |
| committer | Vlad Popa <pvlad@google.com> | Fri Jun 16 00:08:43 2023 +0200 |
| tree | 17412f282449561e1b7c03bc11746348aaa438a4 | |
| parent | 0665ff26a961565c00e67063b4e5f2a95daf3717 [diff] |
Fix deadlock caused by wrong locking order The correct order to lock is mSettingsLock -> VolumeStreamState.class. In some cases this order was broken which lead to some deadlocks. Add quick fix. Might still need to investigate whether we need both locks, for details see b/287066735 Test: atest AudioManagerTest Bug: 283969676 Bug: 283436164 Change-Id: I27afb8da18511291f8786833bf55250097a8e705 Merged-In: Id9c9fe4bd78d23dff92bf3a32c6f16d8e7b96720