From ee37e30c222ec60e51b6bf41309b396f0f23b47a Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Tue, 10 Jun 2014 15:24:26 -0700 Subject: [PATCH] Camera2: Call onCaptureSequenceAborted when appropriate Bug: 15524101 Change-Id: I4615d0b4ae3cae80609586f7dfa8373691a9e384 --- core/java/android/hardware/camera2/impl/CameraDeviceImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java index d9f3af4f0151..f1ce0610b0c7 100644 --- a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java @@ -435,7 +435,7 @@ public class CameraDeviceImpl extends android.hardware.camera2.CameraDevice { * starting and stopping repeating request and flushing. * *

If lastFrameNumber is NO_FRAMES_CAPTURED, it means that the request was never - * sent to HAL. Then onCaptureSequenceCompleted is immediately triggered. + * sent to HAL. Then onCaptureSequenceAborted is immediately triggered. * If lastFrameNumber is non-negative, then the requestId and lastFrameNumber pair * is added to the list mFrameNumberRequestPairs.

* @@ -446,7 +446,7 @@ public class CameraDeviceImpl extends android.hardware.camera2.CameraDevice { private void checkEarlyTriggerSequenceComplete( final int requestId, final long lastFrameNumber) { // lastFrameNumber being equal to NO_FRAMES_CAPTURED means that the request - // was never sent to HAL. Should trigger onCaptureSequenceCompleted immediately. + // was never sent to HAL. Should trigger onCaptureSequenceAborted immediately. if (lastFrameNumber == CaptureListener.NO_FRAMES_CAPTURED) { final CaptureListenerHolder holder; int index = mCaptureListenerMap.indexOfKey(requestId); @@ -463,7 +463,7 @@ public class CameraDeviceImpl extends android.hardware.camera2.CameraDevice { if (holder != null) { if (DEBUG) { - Log.v(TAG, "immediately trigger onCaptureSequenceCompleted because" + Log.v(TAG, "immediately trigger onCaptureSequenceAborted because" + " request did not reach HAL"); } @@ -480,10 +480,9 @@ public class CameraDeviceImpl extends android.hardware.camera2.CameraDevice { || lastFrameNumber > Integer.MAX_VALUE) { throw new AssertionError(lastFrameNumber + " cannot be cast to int"); } - holder.getListener().onCaptureSequenceCompleted( + holder.getListener().onCaptureSequenceAborted( CameraDeviceImpl.this, - requestId, - lastFrameNumber); + requestId); } } }; -- 2.11.0