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

Commit c6e89f8e 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:... 

Merge "Camera: Avoid invalid member variable access from RequestThread" am: aaa51ee2 am: 6b12cf96
am: 78a3ac5b

Change-Id: I50d600e4fa34780bdf2da430ba4816317f6d254d
parents 6b2b2b91 78a3ac5b

services/camera/libcameraservice/device3/Camera3Device.cpp

+5 −1
Original line number Diff line number Diff line
@@ -2151,7 +2151,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);