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

Commit 19e0a033 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I63a7faa7932142e8e54b6e8db6d95c121c517866
parents 2d7bc584 0f6c1c9d
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class CaptureFailure {

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

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