OSDN Git Service

Camera NDK: fix bug in lock order
authorYin-Chia Yeh <yinchiayeh@google.com>
Tue, 7 Nov 2017 01:16:22 +0000 (17:16 -0800)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 9 Nov 2017 05:42:56 +0000 (05:42 +0000)
commit3ad3aecaf66af97c513def4d2d859fbac32bf4ca
treece6f8b1ebc560f1b8c9f5bb20c161ccff12e02ea
parent18d2294a4cd46cc285a95436c503b46184217451
Camera NDK: fix bug in lock order

AImage::close() can be called by AImageReader while holding
AImageReader::mLock.
Also fix ACaptureFailure double free issue.

Test: AR test app + CTS stress
Bug: 68885255
Change-Id: I17037e3e30e0f53b35ca538a3f321693c539cbdc
Merged-In: I17037e3e30e0f53b35ca538a3f321693c539cbdc
(cherry picked from commit a10ab5bfd1ca27128fdbe43ce58a68e92b2896a1)
camera/ndk/impl/ACameraDevice.cpp
media/ndk/NdkImage.cpp
media/ndk/NdkImageReader.cpp
media/ndk/NdkImageReaderPriv.h