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

Commit fe23640d 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 

am: b461a998

Change-Id: Idce2a5e57b4d5bebbe5ee8a4d4736f78a795a2ff
parents 620d94b8 b461a998

services/camera/libcameraservice/device3/Camera3IOStreamBase.cpp

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

    switch (mState) {

        case STATE_IN_RECONFIG:

        case STATE_IN_RECONFIG:

        case STATE_CONFIGURED:

        case STATE_CONFIGURED:

        case STATE_ABANDONED:

            // OK

            // OK

            break;

            break;

        default:

        default:

services/camera/libcameraservice/device3/Camera3OutputStream.cpp

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

        *buffer = 0;

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

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

    } else if (res != OK) {

    } 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);

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

        mState = STATE_ERROR;

        mState = STATE_ABANDONED;

        return res;

        return res;

    }

    }