commit 1960c88baffd5371b69bbe5268702dd02b8a24a3
author Emilian Peev <epeev@google.com> Wed Nov 20 08:23:56 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 20 08:23:56 2019 -0800
tree 419f3e1fefaf996d23e7184a8eb9f5a13cbef079
parent f2bb7b0ccc86a06deae882ac3974e2004eb98a27
parent a4f8c20bf985d4a6d3a108d6813fe01d5b41cd55

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

Change-Id: I691c6c369db7b6334a54dbe98b61711b8185e1cb

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());