From a486624a6d9631fd434468fec7e3b57431f0b785 Mon Sep 17 00:00:00 2001 From: Zhijun He Date: Thu, 27 Mar 2014 23:51:34 -0700 Subject: [PATCH] Camera2: Fix availableTestPatternModes type Also fixed the typo in android.control.mode related with scene mode. Change-Id: I5e311bac4694e1ccfc8d3210fbf8b40e1b31ecef --- core/java/android/hardware/camera2/CameraCharacteristics.java | 4 ++-- 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 37bead845e05..ff7758046909 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 SENSOR_AVAILABLE_TEST_PATTERN_MODES = - new Key("android.sensor.availableTestPatternModes", byte.class); + public static final Key SENSOR_AVAILABLE_TEST_PATTERN_MODES = + new Key("android.sensor.availableTestPatternModes", int[].class); /** *

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 42c8e3daf7c0..679310af12d2 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

+ * 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).

+ * + * @see CameraCharacteristics#CONTROL_AVAILABLE_SCENE_MODES * @see CaptureRequest#CONTROL_MODE */ public static final int CONTROL_MODE_USE_SCENE_MODE = 2; -- 2.11.0