summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware/camera2
diff options
context:
space:
mode:
authorYin-Chia Yeh <yinchiayeh@google.com>2015-01-06 10:32:47 -0800
committerYin-Chia Yeh <yinchiayeh@google.com>2015-01-06 18:46:15 +0000
commit941aac0c0753d41cf70437272538f51db2d50199 (patch)
tree268edf09f39d1d013a1ef08165df78a31ded2357 /core/java/android/hardware/camera2
parent4ae97d3632edf4fd00fe23b9a2304e4e0f2348b7 (diff)
downloadframeworks_base-941aac0c0753d41cf70437272538f51db2d50199.zip
frameworks_base-941aac0c0753d41cf70437272538f51db2d50199.tar.gz
frameworks_base-941aac0c0753d41cf70437272538f51db2d50199.tar.bz2
Camera: doc update for color aberration modes
Code-gened document update for camera2 spec. Bug: 18915494 Change-Id: I4b6236415f93739da4562eac81f53d2fd4c10f69
Diffstat (limited to 'core/java/android/hardware/camera2')
-rw-r--r--core/java/android/hardware/camera2/CameraCharacteristics.java7
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 =