commit 248c5928c919ee33290a3065d4a9427074fc43f4
author Ranjith Kagathi Ananda <ranjith@codeaurora.org> Thu Sep 24 01:03:58 2015 -0700
committer Chien-Yu Chen <cychen@google.com> Fri Sep 25 10:27:31 2015 -0700
tree c369575fa0d836f043553f659f230d116d13bb85
parent e826797867c4d551d7d26edfffde5470a44fdeff

Camera3: Adding checks for stream handle

In certain conditions it is possible that flush
is called before the stream handles are initialized.
Ex: between configureStreams & processCaptureRequest
Adding more checks for such cases.

Bug: 23186410
Ack by: Mansoor Aftab

Change-Id: I10c5ef691ba12f9cf98363613ad28070d82514c3

QCamera2/HAL3/QCamera3Channel.cpp

diff --git a/QCamera2/HAL3/QCamera3Channel.cpp b/QCamera2/HAL3/QCamera3Channel.cpp
index 5446abc..9147dbd 100644
--- a/QCamera2/HAL3/QCamera3Channel.cpp
+++ b/QCamera2/HAL3/QCamera3Channel.cpp
@@ -342,9 +342,12 @@
     memset(&param, 0, sizeof(cam_stream_parm_buffer_t));
     param.type = CAM_STREAM_PARAM_TYPE_SET_BUNDLE_INFO;
     param.bundleInfo = bundleInfo;
-    rc = mStreams[0]->setParameter(param);
-    if (rc != NO_ERROR) {
-        ALOGE("%s: stream setParameter for set bundle failed", __func__);
+
+    if (mStreams[0] != NULL) {
+        rc = mStreams[0]->setParameter(param);
+        if (rc != NO_ERROR) {
+            ALOGE("%s: stream setParameter for set bundle failed", __func__);
+        }
     }
 
     return rc;

QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/QCamera2/HAL3/QCamera3HWI.cpp b/QCamera2/HAL3/QCamera3HWI.cpp
index 63e6d8f..3dc6c9f 100644
--- a/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/QCamera2/HAL3/QCamera3HWI.cpp
@@ -3687,6 +3687,12 @@
 
     CDBG("%s: Unblocking Process Capture Request", __func__);
     pthread_mutex_lock(&mMutex);
+
+    if (mFirstRequest) {
+        pthread_mutex_unlock(&mMutex);
+        return NO_ERROR;
+    }
+
     mFlush = true;
     pthread_mutex_unlock(&mMutex);