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

Commit 3dcdc3d0 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Camera2: Unconditionally shut down streams on disconnect. 

stopPreviewL may do nothing in certain states. Stop streams directly
to avoid those failures, so that we always maintain the HAL interface
invariant that streams referenced by in-flight requests are never
deleted.

Bug: 7276954
Change-Id: Ic4cffc43036f4944684d941981a43d6dd1dce7af
parent 3a6e4532

services/camera/libcameraservice/Camera2Client.cpp

+10 −1
Original line number Diff line number Diff line
@@ -378,7 +378,16 @@ void Camera2Client::disconnect() { 


    ALOGV("Camera %d: Shutting down", mCameraId);



    stopPreviewL();

    res = mStreamingProcessor->stopStream();

    if (res != OK) {

        ALOGE("%s: Problem stopping streaming: %s (%d)",

                __FUNCTION__, strerror(-res), res);

    }

    res = mDevice->waitUntilDrained();

    if (res != OK) {

        ALOGE("%s: Problem waiting for HAL: %s (%d)",

                __FUNCTION__, strerror(-res), res);

    }



    {

        SharedParameters::Lock l(mParameters);