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

Commit fe82275a authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by android-build-merger
Browse files

Merge \"Camera3Device: Correctly shut down abandoned streams\" into nyc-dev 

am: b889242a

Change-Id: I50fd0619dec5488dbeadb903b95e5bd4e5980f61
parents fd75b28a b889242a

services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ status_t Camera3IOStreamBase::disconnectLocked() { 
    switch (mState) {

        case STATE_IN_RECONFIG:

        case STATE_CONFIGURED:

        case STATE_ABANDONED:

            // OK

            break;

        default:

services/camera/libcameraservice/device3/Camera3OutputStream.cpp

+2 −2
Original line number Diff line number Diff line
@@ -653,9 +653,9 @@ status_t Camera3OutputStream::detachBuffer(sp<GraphicBuffer>* buffer, int* fence 
        *buffer = 0;

        ALOGW("%s: the released buffer has already been freed by the buffer queue!", __FUNCTION__);

    } else if (res != OK) {

        // Other errors are fatal.

        // Treat other errors as abandonment

        ALOGE("%s: detach next buffer failed: %s (%d).", __FUNCTION__, strerror(-res), res);

        mState = STATE_ERROR;

        mState = STATE_ABANDONED;

        return res;

    }