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

am 783d3c1e: am 69c66f42: Merge "camera2: describe non-full hw level optional tag entries" into klp-dev

Browse Source 
* commit '783d3c1ed1989e820437fec4224079d8c860ad36':
  camera2: describe non-full hw level optional tag entries
This commit is contained in:
Alex Ray
2013-10-07 16:31:24 -07:00
committed by Android Git Automerger
parent 266b3026c4 783d3c1ed1
commit bb478e6da0
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -487,6 +487,12 @@ public final class CameraCharacteristics extends CameraMetadata {
* Gain factor from electrons to raw units when * Gain factor from electrons to raw units when
* ISO=100 * ISO=100
* </p> * </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 = public static final Key<Rational> SENSOR_BASE_GAIN_FACTOR =
new Key<Rational>("android.sensor.baseGainFactor", Rational.class); 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 * values above this, it can be a mix of analog and
* digital * digital
* </p> * </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 = public static final Key<Integer> SENSOR_MAX_ANALOG_SENSITIVITY =
new Key<Integer>("android.sensor.maxAnalogSensitivity", int.class); new Key<Integer>("android.sensor.maxAnalogSensitivity", int.class);

6
core/java/android/hardware/camera2/CaptureResult.java
View File

@@ -722,6 +722,12 @@ public final class CaptureResult extends CameraMetadata {
* The thermal diode being queried should be inside the sensor PCB, or * The thermal diode being queried should be inside the sensor PCB, or
* somewhere close to it. * somewhere close to it.
* </p> * </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 = public static final Key<Float> SENSOR_TEMPERATURE =
new Key<Float>("android.sensor.temperature", float.class); new Key<Float>("android.sensor.temperature", float.class);