diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-01-07 00:57:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-07 00:57:59 +0000 |
| commit | cabe15ac76dcf72bfa9f0860d00e214b162b14e9 (patch) | |
| tree | 83c89fb697cc54909d018e3d28d3a7907ec76a09 /core/java/android/hardware/camera2 | |
| parent | db400acb24c2352bacba1c9c43c4d1c0d64a36a6 (diff) | |
| parent | 641178f94fa5561cb5fe2f893f689b7cd568eaa1 (diff) | |
| download | frameworks_base-cabe15ac76dcf72bfa9f0860d00e214b162b14e9.zip frameworks_base-cabe15ac76dcf72bfa9f0860d00e214b162b14e9.tar.gz frameworks_base-cabe15ac76dcf72bfa9f0860d00e214b162b14e9.tar.bz2 | |
am 641178f9: am c2112a75: am 8d46f934: Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev
* commit '641178f94fa5561cb5fe2f893f689b7cd568eaa1':
Camera: doc update for color aberration modes
Diffstat (limited to 'core/java/android/hardware/camera2')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index f487f01..1b621d1 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -315,16 +315,15 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * supported by this camera device.</p> * <p>This key lists the valid modes for {@link CaptureRequest#COLOR_CORRECTION_ABERRATION_MODE android.colorCorrection.aberrationMode}. If no * aberration correction modes are available for a device, this list will solely include - * OFF mode.</p> - * <p>For FULL capability device ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} <code>==</code> FULL), OFF is - * always included.</p> + * OFF mode. All camera devices will support either OFF or FAST mode.</p> + * <p>Camera devices that support the MANUAL_POST_PROCESSING capability will always list + * OFF mode. This includes all FULL level devices.</p> * <p>LEGACY devices will always only support FAST mode.</p> * <p><b>Range of valid values:</b><br> * Any value listed in {@link CaptureRequest#COLOR_CORRECTION_ABERRATION_MODE android.colorCorrection.aberrationMode}</p> * <p>This key is available on all devices.</p> * * @see CaptureRequest#COLOR_CORRECTION_ABERRATION_MODE - * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL */ @PublicKey public static final Key<int[]> COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES = |