Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a987db92 authored by Emilian Peev's avatar Emilian Peev Committed by android-build-merger
Browse files

Merge "Camera: Release all composite streams during "detachDevice"" into... 

Merge "Camera: Release all composite streams during "detachDevice"" into qt-qpr1-dev am: f16f2136 am: 01510dc5
am: ff7eab2a

Change-Id: I21ee58b59ce2afefb378f6de51c616f08cc6412e
parents 8219d3fe ff7eab2a

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+9 −0
Original line number Diff line number Diff line
@@ -2032,6 +2032,15 @@ void CameraDeviceClient::detachDevice() { 
        }

    }



    for (size_t i = 0; i < mCompositeStreamMap.size(); i++) {

        auto ret = mCompositeStreamMap.valueAt(i)->deleteInternalStreams();

        if (ret != OK) {

            ALOGE("%s: Failed removing composite stream  %s (%d)", __FUNCTION__,

                    strerror(-ret), ret);

        }

    }

    mCompositeStreamMap.clear();



    Camera2ClientBase::detachDevice();

}