summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Zhijun He <zhijunhe@google.com> 2014-06-04 13:42:41 -0700
committer Zhijun He <zhijunhe@google.com> 2014-06-04 20:56:20 +0000
commitdf9b74781ae0c4554eb51744f10d53117d057982 (patch)
treee6b707a44338317ca2b258057748cca476d659fc
parentf5188cf6d5e474cef3d1ac9bd4e2be4965866d5f (diff)
Camera2: Update availableStreamConfigurations for JPEG sizes
Also Fix some doc issue in availableCapabilities Bug: 12035686 Change-Id: Ie517a587f4a9e6cd9731fcca042e24adf832d9e3
-rw-r--r--core/java/android/hardware/camera2/CameraCharacteristics.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java
index 2f5b4feee781..222374a0e72a 100644
--- a/core/java/android/hardware/camera2/CameraCharacteristics.java
+++ b/core/java/android/hardware/camera2/CameraCharacteristics.java
@@ -810,6 +810,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
* {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} <code>==</code> FULL devices:</p>
* <ul>
* <li>MANUAL_SENSOR</li>
+ * <li>MANUAL_POST_PROCESSING</li>
* </ul>
* <p>Other capabilities may be available on either FULL or LIMITED
* devices, but the app. should query this field to be sure.</p>
@@ -1033,8 +1034,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
* (i.e. format, width, height, output/input stream).</p>
* <p>The configurations are listed as <code>(format, width, height, input?)</code>
* tuples.</p>
- * <p>All camera devices will support sensor maximum resolution (defined by
- * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}) for the JPEG format.</p>
* <p>For a given use case, the actual maximum supported resolution
* may be lower than what is listed here, depending on the destination
* Surface for the image data. For example, for recording video,