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

Commit 97c6397c authored by Ruben Brunk's avatar Ruben Brunk Committed by The Android Automerger
Browse files

camera2: Remove prior repeating request when setting. 

Bug: 11579778
Change-Id: Idb10662413ff5ee939adbdeab68a97cb34750fac
parent 0e40d1d3

core/java/android/hardware/camera2/impl/CameraDevice.java

+4 −4
Original line number Diff line number Diff line
@@ -279,6 +279,10 @@ public class CameraDevice implements android.hardware.camera2.CameraDevice { 
            checkIfCameraClosed();

            int requestId;



            if (repeating) {

                stopRepeating();

            }



            try {

                requestId = mRemoteDevice.submitRequest(request, repeating);

            } catch (CameraRuntimeException e) {
@@ -293,10 +297,6 @@ public class CameraDevice implements android.hardware.camera2.CameraDevice { 
            }



            if (repeating) {

                // Queue for deletion after in-flight requests finish

                if (mRepeatingRequestId != REQUEST_ID_NONE) {

                    mRepeatingRequestIdDeletedList.add(mRepeatingRequestId);

                }

                mRepeatingRequestId = requestId;

            }