commit 2d05e23d5c6160e343a2d00f047883b830be0219
author Emilian Peev <epeev@google.com> Wed Nov 20 08:27:13 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 20 08:27:13 2019 -0800
tree 37ef016a15e6d3bfea44bc672c329c6715f064e7
parent cb4aa3aaf8ef23b4297167ccb0da44285517bd5a
parent 1960c88baffd5371b69bbe5268702dd02b8a24a3

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

Change-Id: I18f80217287d0c23846cc052dce768e7723518c4

services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp b/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp
index 80df7db..5c6c518 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());