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

Merge "Camera2: Fix availableTestPatternModes type"

Browse Source
This commit is contained in:
Zhijun He
2014-03-28 17:33:08 +00:00
committed by Android (Google) Code Review
parent 1c97a5266a a486624a6d
commit ecc5c8a4a8
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/hardware/camera2/CameraCharacteristics.java
View File

@@ -1093,8 +1093,8 @@ public final class CameraCharacteristics extends CameraMetadata {
* *
* @see CaptureRequest#SENSOR_TEST_PATTERN_MODE * @see CaptureRequest#SENSOR_TEST_PATTERN_MODE
*/ */
public static final Key<Byte> SENSOR_AVAILABLE_TEST_PATTERN_MODES = public static final Key<int[]> SENSOR_AVAILABLE_TEST_PATTERN_MODES =
new Key<Byte>("android.sensor.availableTestPatternModes", byte.class); new Key<int[]>("android.sensor.availableTestPatternModes", int[].class);
/** /**
* <p>Which face detection modes are available, * <p>Which face detection modes are available,

7
core/java/android/hardware/camera2/CameraMetadata.java
View File

@@ -1002,8 +1002,11 @@ public abstract class CameraMetadata {
* controls; the camera device will ignore those settings while * controls; the camera device will ignore those settings while
* USE_SCENE_MODE is active (except for FACE_PRIORITY * USE_SCENE_MODE is active (except for FACE_PRIORITY
* scene mode). Other control entries are still active. * scene mode). Other control entries are still active.
* This setting can only be used if availableSceneModes != * This setting can only be used if scene mode is supported
* UNSUPPORTED</p> * (i.e. {@link CameraCharacteristics#CONTROL_AVAILABLE_SCENE_MODES android.control.availableSceneModes} contain some modes
* other than DISABLED).</p>
*
* @see CameraCharacteristics#CONTROL_AVAILABLE_SCENE_MODES
* @see CaptureRequest#CONTROL_MODE * @see CaptureRequest#CONTROL_MODE
*/ */
public static final int CONTROL_MODE_USE_SCENE_MODE = 2; public static final int CONTROL_MODE_USE_SCENE_MODE = 2;