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

Commit ed81ebc3 authored by Ruben Brunk's avatar Ruben Brunk Committed by Android (Google) Code Review
Browse files

Merge "camera2: Fix frame ID returned by legacy mode shim."

parents 97a6c20a 53284d58

core/java/android/hardware/camera2/legacy/RequestQueue.java

+4 −2
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ public class RequestQueue { 
        long ret = INVALID_FRAME;

        if (mRepeatingRequest != null && mRepeatingRequest.getRequestId() == requestId) {

            mRepeatingRequest = null;

            ret = mCurrentRepeatingFrameNumber;

            ret = (mCurrentRepeatingFrameNumber == INVALID_FRAME) ? INVALID_FRAME :

                    mCurrentRepeatingFrameNumber - 1;

            mCurrentRepeatingFrameNumber = INVALID_FRAME;

        } else {

            Log.e(TAG, "cancel failed: no repeating request exists for request id: " + requestId);
@@ -105,7 +106,8 @@ public class RequestQueue { 
        long ret = INVALID_FRAME;

        if (burst.isRepeating()) {

            if (mRepeatingRequest != null) {

                ret = mCurrentRepeatingFrameNumber;

                ret = (mCurrentRepeatingFrameNumber == INVALID_FRAME) ? INVALID_FRAME :

                        mCurrentRepeatingFrameNumber - 1;

            }

            mCurrentRepeatingFrameNumber = INVALID_FRAME;

            mRepeatingRequest = burst;