diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-03-27 23:51:34 -0700 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2014-03-28 10:09:09 -0700 |
| commit | a486624a6d9631fd434468fec7e3b57431f0b785 (patch) | |
| tree | 62004f066cd481bfc54aeb0476c05e088eb58ab6 /core/java | |
| parent | 0e14f2d45557527242f27ce7de9027e6ccaa45d6 (diff) | |
| download | frameworks_base-a486624a6d9631fd434468fec7e3b57431f0b785.zip frameworks_base-a486624a6d9631fd434468fec7e3b57431f0b785.tar.gz frameworks_base-a486624a6d9631fd434468fec7e3b57431f0b785.tar.bz2 | |
Camera2: Fix availableTestPatternModes type
Also fixed the typo in android.control.mode related
with scene mode.
Change-Id: I5e311bac4694e1ccfc8d3210fbf8b40e1b31ecef
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 4 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CameraMetadata.java | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 37bead8..ff77580 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -1093,8 +1093,8 @@ public final class CameraCharacteristics extends CameraMetadata { * * @see CaptureRequest#SENSOR_TEST_PATTERN_MODE */ - public static final Key<Byte> SENSOR_AVAILABLE_TEST_PATTERN_MODES = - new Key<Byte>("android.sensor.availableTestPatternModes", byte.class); + public static final Key<int[]> SENSOR_AVAILABLE_TEST_PATTERN_MODES = + new Key<int[]>("android.sensor.availableTestPatternModes", int[].class); /** * <p>Which face detection modes are available, diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index 42c8e3d..679310a 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -1002,8 +1002,11 @@ public abstract class CameraMetadata { * controls; the camera device will ignore those settings while * USE_SCENE_MODE is active (except for FACE_PRIORITY * scene mode). Other control entries are still active. - * This setting can only be used if availableSceneModes != - * UNSUPPORTED</p> + * This setting can only be used if scene mode is supported + * (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 */ public static final int CONTROL_MODE_USE_SCENE_MODE = 2; |