commit e642ff1bc9597c90f567843fc96d781f3b5f7095
author gitbuildkicker <android-build@google.com> Sun Feb 05 00:08:29 2017 -0800
committer gitbuildkicker <android-build@google.com> Sun Feb 05 00:08:29 2017 -0800
tree 0455944b775373ca7cf4de858c243dc94b663ed6
parent 49d31d2e16be56abea40c0c6ec1f63caeebb21a9
parent a1473ced6dfc60ad55d4f01b2fa3beb0c066c63a

merge in nyc-mr2-release history after reset to nyc-mr2-dev

camera/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index e4782aa..26c9acd 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -9485,7 +9485,9 @@
     for (List<stream_info_t *>::iterator it = mStreamInfo.begin();
         it != mStreamInfo.end(); it++) {
         QCamera3Channel *channel = (QCamera3Channel *)(*it)->stream->priv;
-        channel->stop();
+        if (channel != nullptr) {
+            channel->stop();
+        }
         (*it)->status = INVALID;
     }