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

Commit 8af9bbae authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Lida Wang
Browse files

Camera: Fix wrong wasImageCaptured flag 

CaptureFailure is created with a "dropped" parameter. But what's passed
in is mayHaveBuffers, which is opposite of "dropped".

Test: Camera CTS, GoogleCamera
Bug: 20196738
Change-Id: I42eb2daa78f116502cb1c5943015ea3f4af3f1e3
parent 373ed012

core/java/android/hardware/camera2/CaptureFailure.java

+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;

    }



    /**

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

+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);