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/ACameraDevice.h

diff --git a/camera/ndk/impl/ACameraDevice.h b/camera/ndk/impl/ACameraDevice.h
index 46243b9..fd51a81 100644
--- a/camera/ndk/impl/ACameraDevice.h
+++ b/camera/ndk/impl/ACameraDevice.h
@@ -96,6 +96,8 @@
 
     camera_status_t stopRepeatingLocked();
 
+    camera_status_t flushLocked(ACameraCaptureSession*);
+
     camera_status_t waitUntilIdleLocked();
 
 
@@ -152,13 +154,13 @@
     std::atomic_bool mClosing;
     inline bool isClosed() { return mClosing; }
 
-    bool mInError;
-    camera_status_t mError;
+    bool mInError = false;
+    camera_status_t mError = ACAMERA_OK;
     void onCaptureErrorLocked(
             int32_t errorCode,
             const CaptureResultExtras& resultExtras);
 
-    bool mIdle;
+    bool mIdle = true;
     // This will avoid a busy session being deleted before it's back to idle state
     sp<ACameraCaptureSession> mBusySession;
 
@@ -203,6 +205,7 @@
      ***********************************/
     // The current active session
     ACameraCaptureSession* mCurrentSession = nullptr;
+    bool mFlushing = false;
 
     int mNextSessionId = 0;
     // TODO: might need another looper/handler to handle callbacks from service