summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware/camera2
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-01-07 18:44:33 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-07 18:44:33 +0000
commitfa8d52fef4e0bf3d7c68f8db9ae8c87f0d312250 (patch)
treeb6fadb19a1e19e61b0cd56cc832b35161690fbbb /core/java/android/hardware/camera2
parentcab68c789491615841ab2abc84356a40e4f8e72b (diff)
parent6ed21403e7dea44a70ae06da64229a557ee19c98 (diff)
downloadframeworks_base-fa8d52fef4e0bf3d7c68f8db9ae8c87f0d312250.zip
frameworks_base-fa8d52fef4e0bf3d7c68f8db9ae8c87f0d312250.tar.gz
frameworks_base-fa8d52fef4e0bf3d7c68f8db9ae8c87f0d312250.tar.bz2
am e02fe5af: am c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase"
automerge: 6ed2140 * commit '6ed21403e7dea44a70ae06da64229a557ee19c98': camera2: Clarify the documentation on the ImageReader usecase
Diffstat (limited to 'core/java/android/hardware/camera2')
-rw-r--r--core/java/android/hardware/camera2/CameraDevice.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/CameraDevice.java b/core/java/android/hardware/camera2/CameraDevice.java
index 9e90d01..67b480f 100644
--- a/core/java/android/hardware/camera2/CameraDevice.java
+++ b/core/java/android/hardware/camera2/CameraDevice.java
@@ -183,7 +183,7 @@ public abstract class CameraDevice implements AutoCloseable {
* Then obtain the Surface with
* {@link android.renderscript.Allocation#getSurface}.</li>
*
- * <li>For access to raw, uncompressed JPEG data in the application: Create an
+ * <li>For access to RAW, uncompressed YUV, or compressed JPEG data in the application: Create an
* {@link android.media.ImageReader} object with one of the supported output formats given by
* {@link StreamConfigurationMap#getOutputFormats()}, setting its size to one of the
* corresponding supported sizes by passing the chosen output format into