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

Commit 3e2e7a94 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Fix an issue where the "mFrameCount" field was accessed without its... 

Merge "Fix an issue where the "mFrameCount" field was accessed without its containing object" into jb-mr1-dev
parents b9342ac5 a289bf69

services/camera/libcameraservice/Camera2Device.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1030,7 +1030,7 @@ int Camera2Device::StreamAdapter::enqueue_buffer(const camera2_stream_ops_t* w, 
            const_cast<StreamAdapter*>(static_cast<const StreamAdapter*>(w));

    stream->mFrameCount++;

    ALOGVV("Stream %d enqueue: Frame %d (%p) captured at %lld ns",

            stream->mId, mFrameCount, (void*)(*buffer), timestamp);

            stream->mId, stream->mFrameCount, (void*)(*buffer), timestamp);

    int state = stream->mState;

    if (state != ACTIVE) {

        ALOGE("%s: Called when in bad state: %d", __FUNCTION__, state);