diff options
| author | Zhijun He <zhijunhe@google.com> | 2015-02-05 01:10:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-05 01:10:29 +0000 |
| commit | 81c80180311803d9faabc0bbd6c0813f44edcf7d (patch) | |
| tree | 9d290e324622af8e3dd9c9f1859e30c9f2d1a40a | |
| parent | 80252a92e5736c62d26a7ee013c60c4fbfe4b66b (diff) | |
| parent | f1745ce8a86f79ec8401a40560a8e045f1875006 (diff) | |
| download | frameworks_base-81c80180311803d9faabc0bbd6c0813f44edcf7d.zip frameworks_base-81c80180311803d9faabc0bbd6c0813f44edcf7d.tar.gz frameworks_base-81c80180311803d9faabc0bbd6c0813f44edcf7d.tar.bz2 | |
Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev
| -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 |