diff options
author | Igor Murashkin <iam@google.com> | 2014-05-15 16:51:26 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-15 16:51:26 +0000 |
commit | 25f9a3cd27a3d94b97d3d27c018e77a2e784e13b (patch) | |
tree | d888fd681b71e6487e9c989034e344ef23a0bcfc /graphics | |
parent | 2e465171e0e55aa4f254d4567c44a2778cf92c22 (diff) | |
parent | 9c595174ccaaf3d36315c4a100e47ee4369073f6 (diff) | |
download | frameworks_base-25f9a3cd27a3d94b97d3d27c018e77a2e784e13b.zip frameworks_base-25f9a3cd27a3d94b97d3d27c018e77a2e784e13b.tar.gz frameworks_base-25f9a3cd27a3d94b97d3d27c018e77a2e784e13b.tar.bz2 |
Merge "camera2: Use StreamConfigurationMap for format/size/duration lookup"
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/java/android/graphics/ImageFormat.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/ImageFormat.java b/graphics/java/android/graphics/ImageFormat.java index 062acaf..fe53a17 100644 --- a/graphics/java/android/graphics/ImageFormat.java +++ b/graphics/java/android/graphics/ImageFormat.java @@ -272,6 +272,7 @@ public class ImageFormat { case NV16: case YUY2: case YV12: + case JPEG: case NV21: case YUV_420_888: case RAW_SENSOR: |