Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Camera: Fix wrong wasImageCaptured flag" into sc-qpr1-dev

Browse Source
This commit is contained in:
Eino-Ville Talvala
2021-10-08 20:10:28 +00:00
committed by Android (Google) Code Review
parent 00c890cda7 8af9bbaeed
commit 0f6c1c9d24
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/hardware/camera2/CaptureFailure.java
View File

@@ -59,7 +59,7 @@ public class CaptureFailure {
private final CaptureRequest mRequest; private final CaptureRequest mRequest;
private final int mReason; private final int mReason;
private final boolean mDropped; private final boolean mWasImageCaptured;
private final int mSequenceId; private final int mSequenceId;
private final long mFrameNumber; private final long mFrameNumber;
private final String mErrorPhysicalCameraId; private final String mErrorPhysicalCameraId;
@@ -68,10 +68,11 @@ public class CaptureFailure {
* @hide * @hide
*/ */
public CaptureFailure(CaptureRequest request, int reason, public CaptureFailure(CaptureRequest request, int reason,
boolean dropped, int sequenceId, long frameNumber, String errorPhysicalCameraId) { boolean wasImageCaptured, int sequenceId, long frameNumber,
String errorPhysicalCameraId) {
mRequest = request; mRequest = request;
mReason = reason; mReason = reason;
mDropped = dropped; mWasImageCaptured = wasImageCaptured;
mSequenceId = sequenceId; mSequenceId = sequenceId;
mFrameNumber = frameNumber; mFrameNumber = frameNumber;
mErrorPhysicalCameraId = errorPhysicalCameraId; mErrorPhysicalCameraId = errorPhysicalCameraId;
@@ -141,7 +142,7 @@ public class CaptureFailure {
* @return boolean True if the image was captured, false otherwise. * @return boolean True if the image was captured, false otherwise.
*/ */
public boolean wasImageCaptured() { public boolean wasImageCaptured() {
return !mDropped; return mWasImageCaptured;
} }
/** /**

2
core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
View File

@@ -1867,7 +1867,7 @@ public class CameraDeviceImpl extends CameraDevice
final CaptureFailure failure = new CaptureFailure( final CaptureFailure failure = new CaptureFailure(
request, request,
reason, reason,
/*dropped*/ mayHaveBuffers, mayHaveBuffers,
requestId, requestId,
frameNumber, frameNumber,
errorPhysicalCameraId); errorPhysicalCameraId);