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

Commit 3a9ace7b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: I5fec062950b09211988c3b784c1608dcfbaae191
parents 3272a248 468c1263

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

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

public class RequestQueue {

    private static final String TAG = "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 BurstHolder mRepeatingRequest = null;

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

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

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

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

                            Log.d(TAG, "Stopped repeating request. Last frame number is " +

                                    lastFrameNumber);

                                    lastFrameNumber);

                        }

                        }

                        if (lastFrameNumber != RequestQueue.INVALID_FRAME) {

                            mDeviceState.setRepeatingRequestError(lastFrameNumber,

                            mDeviceState.setRepeatingRequestError(lastFrameNumber,

                                    burstHolder.getRequestId());

                                    burstHolder.getRequestId());

                        } else {

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

                                    " already canceled!");

                        }

                    }

                    }





                    if (DEBUG) {

                    if (DEBUG) {