commit | 085dd0935c9cd19791a9a58a4df4a05e29eadca7 | [log] [tgz] |
---|---|---|
author | Yin-Chia Yeh <yinchiayeh@google.com> | Wed Mar 02 14:16:31 2016 -0800 |
committer | Yin-Chia Yeh <yinchiayeh@google.com> | Thu Mar 03 17:34:00 2016 -0800 |
tree | 9da119e95d054a5429075bb8c8f1c39e26d3dcf8 | |
parent | 97d5e4eb77687288b463f300912f6eb5c2b5b60e [diff] [blame] |
CameraNDK: prevent double closing session Bug: 27102995 Change-Id: Ie3e9870d1fc1025cab7a1019ed7d056fe07536ad
diff --git a/camera/ndk/impl/ACameraCaptureSession.cpp b/camera/ndk/impl/ACameraCaptureSession.cpp index 7f1b75d..b741e46 100644 --- a/camera/ndk/impl/ACameraCaptureSession.cpp +++ b/camera/ndk/impl/ACameraCaptureSession.cpp
@@ -39,6 +39,15 @@ void ACameraCaptureSession::closeByApp() { + { + Mutex::Autolock _l(mSessionLock); + if (mClosedByApp) { + // Do not close twice + return; + } + mClosedByApp = true; + } + sp<CameraDevice> dev = getDeviceSp(); if (dev != nullptr) { dev->lockDeviceForSessionOps();