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

Merge "Camera2: Unhide some capture request templates"

Browse Source
This commit is contained in:
Zhijun He
2014-02-15 01:34:57 +00:00
committed by Android (Google) Code Review
parent 22c5abff5f fa8cc5f680
commit b35badac43
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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 {

2
core/java/android/hardware/camera2/CameraDevice.java
View File

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