commit 309d05d030903e7849affd60c58d4236147aa390
author Yin-Chia Yeh <yinchiayeh@google.com> Mon Mar 28 10:15:31 2016 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Tue Mar 29 16:13:37 2016 -0700
tree 2546b8f92d5ff120f73b454156b58d950c9ef99e
parent d9bd004bbe426978a2de8ee7d0489317b7580bdf

CameraNDK: implement abortCaptures API

Bug: 27102995
Change-Id: Idaf1db02e0bcc60bb9cdb2797b4479ea0389f5f9

camera/ndk/impl/ACameraCaptureSession.cpp

diff --git a/camera/ndk/impl/ACameraCaptureSession.cpp b/camera/ndk/impl/ACameraCaptureSession.cpp
index b741e46..b9c159d 100644
--- a/camera/ndk/impl/ACameraCaptureSession.cpp
+++ b/camera/ndk/impl/ACameraCaptureSession.cpp
@@ -90,6 +90,24 @@
 }
 
 camera_status_t
+ACameraCaptureSession::abortCaptures() {
+    sp<CameraDevice> dev = getDeviceSp();
+    if (dev == nullptr) {
+        ALOGE("Error: Device associated with session %p has been closed!", this);
+        return ACAMERA_ERROR_SESSION_CLOSED;
+    }
+
+    camera_status_t ret;
+    dev->lockDeviceForSessionOps();
+    {
+        Mutex::Autolock _l(mSessionLock);
+        ret = dev->flushLocked(this);
+    }
+    dev->unlockDevice();
+    return ret;
+}
+
+camera_status_t
 ACameraCaptureSession::setRepeatingRequest(
         /*optional*/ACameraCaptureSession_captureCallbacks* cbs,
         int numRequests, ACaptureRequest** requests,