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

Commit 214a17fd authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

Camera3: Always close HAL device even in face of errors. 

To improve robustness, make sure the HAL device instance is always
closed, even if it cannot be put into the IDLE state.

Bug: 9414167
Change-Id: I8e7035ff0afe7214951f9824e561b340cb37592e
parent 1191454a

services/camera/libcameraservice/Camera3Device.cpp

+20 −10
Original line number Diff line number Diff line
@@ -181,24 +181,29 @@ status_t Camera3Device::disconnect() { 


    ALOGV("%s: E", __FUNCTION__);



    status_t res;

    if (mStatus == STATUS_UNINITIALIZED) return OK;

    status_t res = OK;

    if (mStatus == STATUS_UNINITIALIZED) return res;



    if (mStatus == STATUS_ACTIVE ||

            (mStatus == STATUS_ERROR && mRequestThread != NULL)) {

        res = mRequestThread->clearRepeatingRequests();

        if (res != OK) {

            SET_ERR_L("Can't stop streaming");

            return res;

        }

            // Continue to close device even in case of error

        } else {

            res = waitUntilDrainedLocked();

            if (res != OK) {

                SET_ERR_L("Timeout waiting for HAL to drain");

            return res;

                // Continue to close device even in case of error

            }

        }

    }

    assert(mStatus == STATUS_IDLE || mStatus == STATUS_ERROR);



    if (mStatus == STATUS_ERROR) {

        CLOGE("Shutting down in an error state");

    }



    if (mRequestThread != NULL) {

        mRequestThread->requestExit();

    }
@@ -207,7 +212,12 @@ status_t Camera3Device::disconnect() { 
    mInputStream.clear();



    if (mRequestThread != NULL) {

        if (mStatus != STATUS_ERROR) {

            // HAL may be in a bad state, so waiting for request thread

            // (which may be stuck in the HAL processCaptureRequest call)

            // could be dangerous.

            mRequestThread->join();

        }

        mRequestThread.clear();

    }
@@ -219,7 +229,7 @@ status_t Camera3Device::disconnect() { 
    mStatus = STATUS_UNINITIALIZED;



    ALOGV("%s: X", __FUNCTION__);

    return OK;

    return res;

}



status_t Camera3Device::dump(int fd, const Vector<String16> &args) {