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

Commit b35badac authored by Zhijun He's avatar Zhijun He Committed by Android (Google) Code Review
Browse files

Merge "Camera2: Unhide some capture request templates"

parents 22c5abff fa8cc5f6

api/current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -11323,10 +11323,12 @@ package android.hardware.camera2 { 
    method public abstract int setRepeatingBurst(java.util.List<android.hardware.camera2.CaptureRequest>, android.hardware.camera2.CameraDevice.CaptureListener, android.os.Handler) throws android.hardware.camera2.CameraAccessException;

    method public abstract int setRepeatingBurst(java.util.List<android.hardware.camera2.CaptureRequest>, android.hardware.camera2.CameraDevice.CaptureListener, android.os.Handler) throws android.hardware.camera2.CameraAccessException;

    method public abstract int setRepeatingRequest(android.hardware.camera2.CaptureRequest, android.hardware.camera2.CameraDevice.CaptureListener, android.os.Handler) throws android.hardware.camera2.CameraAccessException;

    method public abstract int setRepeatingRequest(android.hardware.camera2.CaptureRequest, android.hardware.camera2.CameraDevice.CaptureListener, android.os.Handler) throws android.hardware.camera2.CameraAccessException;

    method public abstract void stopRepeating() throws android.hardware.camera2.CameraAccessException;

    method public abstract void stopRepeating() throws android.hardware.camera2.CameraAccessException;

    field public static final int TEMPLATE_MANUAL = 6; // 0x6

    field public static final int TEMPLATE_PREVIEW = 1; // 0x1

    field public static final int TEMPLATE_PREVIEW = 1; // 0x1

    field public static final int TEMPLATE_RECORD = 3; // 0x3

    field public static final int TEMPLATE_RECORD = 3; // 0x3

    field public static final int TEMPLATE_STILL_CAPTURE = 2; // 0x2

    field public static final int TEMPLATE_STILL_CAPTURE = 2; // 0x2

    field public static final int TEMPLATE_VIDEO_SNAPSHOT = 4; // 0x4

    field public static final int TEMPLATE_VIDEO_SNAPSHOT = 4; // 0x4

    field public static final int TEMPLATE_ZERO_SHUTTER_LAG = 5; // 0x5

  }

  }

















  public static abstract class CameraDevice.CaptureListener {







  public static abstract class CameraDevice.CaptureListener {

























core/java/android/hardware/camera2/CameraDevice.java



+0
−2




























Original line number
Original line
Diff line number
Diff line








@@ -92,7 +92,6 @@ public interface CameraDevice extends AutoCloseable {









     * AE/AWB/AF should be on auto mode.







     * AE/AWB/AF should be on auto mode.











     *







     *











     * @see #createCaptureRequest







     * @see #createCaptureRequest











     * @hide














     */







     */











    public static final int TEMPLATE_ZERO_SHUTTER_LAG = 5;







    public static final int TEMPLATE_ZERO_SHUTTER_LAG = 5;





























@@ -105,7 +104,6 @@ public interface CameraDevice extends AutoCloseable {









     * application depending on the intended use case.







     * application depending on the intended use case.











     *







     *











     * @see #createCaptureRequest







     * @see #createCaptureRequest











     * @hide














     */







     */











    public static final int TEMPLATE_MANUAL = 6;







    public static final int TEMPLATE_MANUAL = 6;