| commit | c894f7ffde650e6877101df8623fe3aa63bb16b4 | [log] [tgz] |
|---|---|---|
| author | Jayant Chowdhary <jchowdhary@google.com> | Fri Sep 25 22:42:39 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 25 22:42:39 2020 +0000 |
| tree | 6f35e15e67dd6ab5b77cf98da7c1aee0f467b602 | |
| parent | 2e53a20fea1c596aad48a390cce82ffd693407dd [diff] | |
| parent | a0020f9af7c60332248bf4f4cbaf8b3ccba7331c [diff] |
Merge "Camera: Fix deadlock caused by ordering of mStatusLock and mCameraStatesLock." am: 9fb67351a9 am: bd8b8c172c am: a0020f9af7 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1438091 Change-Id: I637a79e24e1e97cbb0378912ff513fff582eef99