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

Commit 2628bc9d authored by Igor Murashkin's avatar Igor Murashkin Committed by Android (Google) Code Review
Browse files

Merge "camera3: Don't crash when taking a still capture with ZSL disabled" into jb-mr2-dev

parents f2ae7606 768b7d07

services/camera/libcameraservice/camera2/ZslProcessor3.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -305,8 +305,11 @@ status_t ZslProcessor3::clearZslQueue() { 
}

}





status_t ZslProcessor3::clearZslQueueLocked() {

status_t ZslProcessor3::clearZslQueueLocked() {

    if (mZslStream != 0) {

        return mZslStream->clearInputRingBuffer();

        return mZslStream->clearInputRingBuffer();

    }

    }

    return OK;

}





void ZslProcessor3::dump(int fd, const Vector<String16>& /*args*/) const {

void ZslProcessor3::dump(int fd, const Vector<String16>& /*args*/) const {

    Mutex::Autolock l(mInputMutex);

    Mutex::Autolock l(mInputMutex);