diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-03-28 17:37:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-28 17:37:28 +0000 |
| commit | ad295d14c52b4949d749415ac8cb36ee6eda77b9 (patch) | |
| tree | e1f7f0d00f029203030d408eb0b693e73939d78f | |
| parent | 54161136c007f9152d9809005418a6186e887307 (diff) | |
| parent | ecc5c8a4a8590e0ea4aa82b5af8e87e6c2882fae (diff) | |
| download | frameworks_base-ad295d14c52b4949d749415ac8cb36ee6eda77b9.zip frameworks_base-ad295d14c52b4949d749415ac8cb36ee6eda77b9.tar.gz frameworks_base-ad295d14c52b4949d749415ac8cb36ee6eda77b9.tar.bz2 | |
am ecc5c8a4: Merge "Camera2: Fix availableTestPatternModes type"
* commit 'ecc5c8a4a8590e0ea4aa82b5af8e87e6c2882fae':
Camera2: Fix availableTestPatternModes type
| -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; |