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

Commit 6b12cf96 authored by Emilian Peev's avatar Emilian Peev Committed by android-build-merger
Browse files

Merge "Camera: Avoid invalid member variable access from RequestThread" 

am: aaa51ee2

Change-Id: Icfe17a380fce1411e60b0d313c36fc7748b80fcd
parents 86f3ee84 aaa51ee2

services/camera/libcameraservice/device3/Camera3Device.cpp

+5 −1
Original line number Diff line number Diff line
@@ -1804,7 +1804,11 @@ void Camera3Device::pauseStateNotify(bool enable) { 


// Pause to reconfigure

status_t Camera3Device::internalPauseAndWaitLocked(nsecs_t maxExpectedDuration) {

    if (mRequestThread.get() != nullptr) {

        mRequestThread->setPaused(true);

    } else {

        return NO_INIT;

    }



    ALOGV("%s: Camera %s: Internal wait until idle (% " PRIi64 " ns)", __FUNCTION__, mId.string(),

          maxExpectedDuration);