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

Commit 1f54af09 authored by Rachad Alao's avatar Rachad Alao Committed by Android Git Automerger
Browse files

am 00b3f942: am 4fe6429b: Merge "Camera2: Rename TEMPLATE_MANUAL to... 

am 00b3f942: am 4fe6429b: Merge "Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG" into klp-dev

* commit '00b3f942':
  Camera2: Rename TEMPLATE_MANUAL to TEMPLATE_ZERO_SHUTTER_LAG
parents be9e10a2 00b3f942

api/current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -10869,7 +10869,6 @@ package android.hardware.camera2 { 
    method public abstract void setRepeatingRequest(android.hardware.camera2.CaptureRequest, android.hardware.camera2.CameraDevice.CaptureListener, android.os.Handler) throws android.hardware.camera2.CameraAccessException;

    method public abstract void 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;

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

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

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

    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

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

+12 −1
Original line number Original line Diff line number Diff line
@@ -88,6 +88,16 @@ public interface CameraDevice extends AutoCloseable { 
     */

     */

    public static final int TEMPLATE_VIDEO_SNAPSHOT = 4;

    public static final int TEMPLATE_VIDEO_SNAPSHOT = 4;





    /**

     * Create a request suitable for zero shutter lag still capture. This means

     * means maximizing image quality without compromising preview frame rate.

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

     *

     * @see #createCaptureRequest

     * @hide

     */

    public static final int TEMPLATE_ZERO_SHUTTER_LAG = 5;



    /**

    /**

     * A basic template for direct application control of capture

     * A basic template for direct application control of capture

     * parameters. All automatic control is disabled (auto-exposure, auto-white

     * parameters. All automatic control is disabled (auto-exposure, auto-white
@@ -97,8 +107,9 @@ 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 = 5;

    public static final int TEMPLATE_MANUAL = 6;





    /**

    /**

     * Get the ID of this camera device.

     * Get the ID of this camera device.