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

Commit 1ae8b757 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Merge "Camera: Don't update frameNumberTracker for physical camera result... 

Merge "Camera: Don't update frameNumberTracker for physical camera result error" into udc-dev am: 62c81b84

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22860648



Change-Id: I3d3babf7e79422fb2e8443ae34f04049053f1216
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9adfd93b 62c81b84

core/java/android/hardware/camera2/CameraCaptureSession.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -1397,6 +1397,11 @@ public abstract class CameraCaptureSession implements AutoCloseable { 
         * the capture may have been pushed to their respective output

         * the capture may have been pushed to their respective output

         * streams.</p>

         * streams.</p>

         *

         *

         * <p>If a logical multi-camera fails to generate capture result for one of

         * its physical cameras, this method will be called with a {@link CaptureFailure}

         * for that physical camera. In such cases, as long as the logical camera capture

         * result is valid, {@link #onCaptureCompleted} will still be called.</p>

         *

         * <p>The default implementation of this method does nothing.</p>

         * <p>The default implementation of this method does nothing.</p>

         *

         *

         * @param session

         * @param session

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

+12 −9
Original line number Original line Diff line number Diff line
@@ -1908,6 +1908,8 @@ public class CameraDeviceImpl extends CameraDevice 
                Log.v(TAG, String.format("got error frame %d", frameNumber));

                Log.v(TAG, String.format("got error frame %d", frameNumber));

            }

            }





            // Do not update frame number tracker for physical camera result error.

            if (errorPhysicalCameraId == null) {

                // Update FrameNumberTracker for every frame during HFR mode.

                // Update FrameNumberTracker for every frame during HFR mode.

                if (mBatchOutputMap.containsKey(requestId)) {

                if (mBatchOutputMap.containsKey(requestId)) {

                    for (int i = 0; i < mBatchOutputMap.get(requestId); i++) {

                    for (int i = 0; i < mBatchOutputMap.get(requestId); i++) {
@@ -1920,6 +1922,7 @@ public class CameraDeviceImpl extends CameraDevice 
                }

                }





                checkAndFireSequenceComplete();

                checkAndFireSequenceComplete();

            }





            // Dispatch the failure callback

            // Dispatch the failure callback

            final long ident = Binder.clearCallingIdentity();

            final long ident = Binder.clearCallingIdentity();