summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware/camera2
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-01-07 18:42:57 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-07 18:42:57 +0000
commit6ed21403e7dea44a70ae06da64229a557ee19c98 (patch)
tree11f61efd682285adae10f59fcd62dd319f9ddb30 /core/java/android/hardware/camera2
parentdf3d1307d5141c394b0eb521d6beb7f262fb3e3f (diff)
parente02fe5afac0bc792559a4c424ffc8391c501abfe (diff)
downloadframeworks_base-6ed21403e7dea44a70ae06da64229a557ee19c98.zip
frameworks_base-6ed21403e7dea44a70ae06da64229a557ee19c98.tar.gz
frameworks_base-6ed21403e7dea44a70ae06da64229a557ee19c98.tar.bz2
am e02fe5af: am c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase"
* commit 'e02fe5afac0bc792559a4c424ffc8391c501abfe': 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