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

Commit 39dfc229 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Disconnect composite streams from output surface at shutdown"

parents 54985e85 2c54504d

services/camera/libcameraservice/api2/DepthCompositeStream.cpp

+5 −0
Original line number Diff line number Diff line
@@ -634,6 +634,11 @@ status_t DepthCompositeStream::deleteInternalStreams() { 
        mDepthStreamId = -1;

    }



    if (mOutputSurface != nullptr) {

        mOutputSurface->disconnect(NATIVE_WINDOW_API_CAMERA);

        mOutputSurface.clear();

    }



    return ret;

}

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

+4 −0
Original line number Diff line number Diff line
@@ -214,6 +214,10 @@ status_t HeicCompositeStream::deleteInternalStreams() { 
        mAppSegmentStreamId = -1;

    }



    if (mOutputSurface != nullptr) {

        mOutputSurface->disconnect(NATIVE_WINDOW_API_CAMERA);

        mOutputSurface.clear();

    }

    return res;

}