Merge "Camera: Check consumer interface before disconnecting"

5 years ago · aa59be48d4
parent a8129f7246 359adca4b7
commit aa59be48d4
1 changed files with 3 additions and 1 deletions
--- a/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp
+++ b/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp
@ -139,7 +139,9 @@ void Camera3StreamSplitter::disconnect() {
    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());