diff options
| author | Zhijun He <zhijunhe@google.com> | 2015-02-05 03:50:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-05 03:50:18 +0000 |
| commit | d7c32e484364015e3965c6c090e1c223e14b3e2f (patch) | |
| tree | f040e6fb4a569e25430b702313794b39b80eabdc /core/java/android/hardware/camera2 | |
| parent | 77ad055957aa0ed442301fa2baf0636712a53d62 (diff) | |
| parent | 1350671f406c238439e1dc4378287bd422aaf636 (diff) | |
| download | frameworks_base-d7c32e484364015e3965c6c090e1c223e14b3e2f.zip frameworks_base-d7c32e484364015e3965c6c090e1c223e14b3e2f.tar.gz frameworks_base-d7c32e484364015e3965c6c090e1c223e14b3e2f.tar.bz2 | |
am 1350671f: am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev automerge: 6bafb86
* commit '1350671f406c238439e1dc4378287bd422aaf636':
Camera2: relax the EV compensation requirements
Diffstat (limited to 'core/java/android/hardware/camera2')
| -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 16bc6a4..bb45b91 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 |