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

Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev

Browse Source
This commit is contained in:
Yin-Chia Yeh
2015-01-06 23:58:59 +00:00
committed by Android (Google) Code Review
parent 55fb7576c3 941aac0c07
commit 8d46f934ca
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -315,16 +315,15 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
* supported by this camera device.</p> * 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 * <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 * aberration correction modes are available for a device, this list will solely include
* OFF mode.</p> * OFF mode. All camera devices will support either OFF or FAST mode.</p>
* <p>For FULL capability device ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} <code>==</code> FULL), OFF is * <p>Camera devices that support the MANUAL_POST_PROCESSING capability will always list
* always included.</p> * OFF mode. This includes all FULL level devices.</p>
* <p>LEGACY devices will always only support FAST mode.</p> * <p>LEGACY devices will always only support FAST mode.</p>
* <p><b>Range of valid values:</b><br> * <p><b>Range of valid values:</b><br>
* Any value listed in {@link CaptureRequest#COLOR_CORRECTION_ABERRATION_MODE android.colorCorrection.aberrationMode}</p> * Any value listed in {@link CaptureRequest#COLOR_CORRECTION_ABERRATION_MODE android.colorCorrection.aberrationMode}</p>
* <p>This key is available on all devices.</p> * <p>This key is available on all devices.</p>
* *
* @see CaptureRequest#COLOR_CORRECTION_ABERRATION_MODE * @see CaptureRequest#COLOR_CORRECTION_ABERRATION_MODE
* @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL
*/ */
@PublicKey @PublicKey
public static final Key<int[]> COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES = public static final Key<int[]> COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES =