diff options
| author | Alex Ray <aray@google.com> | 2013-10-07 16:31:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-07 16:31:24 -0700 |
| commit | bb478e6da0a80da5a9dd00a005d00c40e31cfc18 (patch) | |
| tree | 22537e8cd5e750dc02fd9a4a1714db1391b96d0f /core/java | |
| parent | 266b3026c42ed3ba0feedd9abe3e3bb6932c2f23 (diff) | |
| parent | 783d3c1ed1989e820437fec4224079d8c860ad36 (diff) | |
am 783d3c1e: am 69c66f42: Merge "camera2: describe non-full hw level optional tag entries" into klp-dev
* commit '783d3c1ed1989e820437fec4224079d8c860ad36':
camera2: describe non-full hw level optional tag entries
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 12 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureResult.java | 6 |
2 files changed, 18 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 85fa7d6885e0..4fe2c4d3669b 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -487,6 +487,12 @@ public final class CameraCharacteristics extends CameraMetadata { * Gain factor from electrons to raw units when * ISO=100 * </p> + * + * <b>Optional</b> - This value may be null on some devices. + * + * <b>{@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_FULL HARDWARE_LEVEL_FULL}</b> - + * Present on all devices that report being FULL level hardware devices in the + * {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL HARDWARE_LEVEL} key. */ public static final Key<Rational> SENSOR_BASE_GAIN_FACTOR = new Key<Rational>("android.sensor.baseGainFactor", Rational.class); @@ -502,6 +508,12 @@ public final class CameraCharacteristics extends CameraMetadata { * values above this, it can be a mix of analog and * digital * </p> + * + * <b>Optional</b> - This value may be null on some devices. + * + * <b>{@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_FULL HARDWARE_LEVEL_FULL}</b> - + * Present on all devices that report being FULL level hardware devices in the + * {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL HARDWARE_LEVEL} key. */ public static final Key<Integer> SENSOR_MAX_ANALOG_SENSITIVITY = new Key<Integer>("android.sensor.maxAnalogSensitivity", int.class); diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 30bffc45c9f9..dbd0457e525f 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -722,6 +722,12 @@ public final class CaptureResult extends CameraMetadata { * The thermal diode being queried should be inside the sensor PCB, or * somewhere close to it. * </p> + * + * <b>Optional</b> - This value may be null on some devices. + * + * <b>{@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_FULL HARDWARE_LEVEL_FULL}</b> - + * Present on all devices that report being FULL level hardware devices in the + * {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL HARDWARE_LEVEL} key. */ public static final Key<Float> SENSOR_TEMPERATURE = new Key<Float>("android.sensor.temperature", float.class); |