| commit | 38272a36b02201c450b6e1d080095a60ca2e394d | [log] [tgz] |
|---|---|---|
| author | Jayant Chowdhary <jchowdhary@google.com> | Fri Sep 25 23:14:02 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 25 23:14:02 2020 +0000 |
| tree | 3255fccaa7596c792828d7f7b87efff03c9cedd2 | |
| parent | 9d8bbbfecfdb9c99ce7e4f677ea120dbb1bd2a8c [diff] | |
| parent | c894f7ffde650e6877101df8623fe3aa63bb16b4 [diff] |
Merge "Camera: Fix deadlock caused by ordering of mStatusLock and mCameraStatesLock." am: 9fb67351a9 am: bd8b8c172c am: a0020f9af7 am: c894f7ffde Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1438091 Change-Id: Idaecee0224129870303facd718ba27db2ce04956