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

Commit 468c1263 authored by Emilian Peev's avatar Emilian Peev Committed by android-build-merger
Browse files

Merge "Camera: Avoid removing valid repeating requests" am: 0e7782c8 

am: a491caf3

Change-Id: Ia6e5cfabdea60d3dffb018f15b4fa1a4224a153c
parents 4989c888 a491caf3

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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import java.util.List; 
public class RequestQueue {

    private static final String TAG = "RequestQueue";



    private static final long INVALID_FRAME = -1;

    public static final long INVALID_FRAME = -1;



    private BurstHolder mRepeatingRequest = null;

    private final ArrayDeque<BurstHolder> mRequestQueue = new ArrayDeque<BurstHolder>();

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

+7 −2
Original line number Diff line number Diff line
@@ -948,8 +948,13 @@ public class RequestThreadManager { 
                            Log.d(TAG, "Stopped repeating request. Last frame number is " +

                                    lastFrameNumber);

                        }

                        if (lastFrameNumber != RequestQueue.INVALID_FRAME) {

                            mDeviceState.setRepeatingRequestError(lastFrameNumber,

                                    burstHolder.getRequestId());

                        } else {

                            Log.e(TAG, "Repeating request id: " + burstHolder.getRequestId() +

                                    " already canceled!");

                        }

                    }



                    if (DEBUG) {