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

Commit ac139a7b authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by android-build-merger
Browse files

Merge "Camera: add proper nullptr check" into oc-dr1-dev 

am: 4b521599

Change-Id: I804efa28aa2ae3db93af81c6dd05d8e2ad7990b4
parents b1882b1d 4b521599

services/camera/libcameraservice/device3/Camera3Device.cpp

+3 −1
Original line number Diff line number Diff line
@@ -2350,7 +2350,9 @@ void Camera3Device::setErrorStateLockedV(const char *fmt, va_list args) { 


    mErrorCause = errorCause;



    if (mRequestThread != nullptr) {

        mRequestThread->setPaused(true);

    }

    internalUpdateStatusLocked(STATUS_ERROR);



    // Notify upstream about a device error