commit a4f8c20bf985d4a6d3a108d6813fe01d5b41cd55
author Emilian Peev <epeev@google.com> Wed Nov 20 08:20:02 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 20 08:20:02 2019 -0800
tree 36c529afa2ebdbbe4a31b8649aaf60cd957ff979
parent f1a372c1792ad6b92a7cabd804a5195589daf8e0
parent aa59be48d4385700852552e3359f5c41a73fcd16

Merge "Camera: Check consumer interface before disconnecting"
am: aa59be48d4

Change-Id: I2c1b1878b8ca56bcce5a977afec2170a62a738a0

services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp b/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp
index 84c2ec7..3089181 100644
--- a/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp
+++ b/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp
@@ -139,7 +139,9 @@
     mOutputSlots.clear();
     mConsumerBufferCount.clear();
 
-    mConsumer->consumerDisconnect();
+    if (mConsumer.get() != nullptr) {
+        mConsumer->consumerDisconnect();
+    }
 
     if (mBuffers.size() > 0) {
         SP_LOGW("%zu buffers still being tracked", mBuffers.size());