diff options
| author | Zhijun He <zhijunhe@google.com> | 2015-02-05 03:44:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-05 03:44:01 +0000 |
| commit | 1350671f406c238439e1dc4378287bd422aaf636 (patch) | |
| tree | 072c3eb9e2b7f4be7be2ddf7fd836a0b3a81b8cc | |
| parent | c2bf7440ba9e3484d37d9c5df2ef02710682b7ed (diff) | |
| parent | 6bafb866554a7dea0844438c27a7caea0aab83f2 (diff) | |
| download | frameworks_base-1350671f406c238439e1dc4378287bd422aaf636.zip frameworks_base-1350671f406c238439e1dc4378287bd422aaf636.tar.gz frameworks_base-1350671f406c238439e1dc4378287bd422aaf636.tar.bz2 | |
am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev
automerge: 6bafb86
* commit '6bafb866554a7dea0844438c27a7caea0aab83f2':
Camera2: relax the EV compensation requirements
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 1b621d1..7cf8fb0 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -391,10 +391,12 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * {@link CaptureRequest#CONTROL_AE_EXPOSURE_COMPENSATION android.control.aeExposureCompensation}, in counts of {@link CameraCharacteristics#CONTROL_AE_COMPENSATION_STEP android.control.aeCompensationStep}, * that are supported by this camera device.</p> * <p><b>Range of valid values:</b><br></p> + * <p>Range [0,0] indicates that exposure compensation is not supported.</p> + * <p>For LIMITED and FULL devices, range must follow below requirements if exposure + * compensation is supported (<code>range != [0, 0]</code>):</p> * <p><code>Min.exposure compensation * {@link CameraCharacteristics#CONTROL_AE_COMPENSATION_STEP android.control.aeCompensationStep} <= -2 EV</code></p> * <p><code>Max.exposure compensation * {@link CameraCharacteristics#CONTROL_AE_COMPENSATION_STEP android.control.aeCompensationStep} >= 2 EV</code></p> - * <p>LEGACY devices may support a smaller range than this, including the range [0,0], which - * indicates that changing the exposure compensation is not supported.</p> + * <p>LEGACY devices may support a smaller range than this.</p> * <p>This key is available on all devices.</p> * * @see CameraCharacteristics#CONTROL_AE_COMPENSATION_STEP |