| commit | baf7cd36204635775225d6bcf4c067d642ddc195 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Mar 05 03:40:14 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 05 03:40:14 2019 +0000 |
| tree | bb57496cf02fb03f5bce21c9aecf4c66179b96f0 | |
| parent | 35a827b9ed63fc42a20f57c6ebb1fd513fe9d1d4 [diff] | |
| parent | 58077d5d53b7b46a4b1ef9bedc2055c9416749bc [diff] |
Merge "Add "image/heic" to supported mimes of ImageDecoder"
diff --git a/graphics/java/android/graphics/ImageDecoder.java b/graphics/java/android/graphics/ImageDecoder.java index d3ca11c..2cf802b 100644 --- a/graphics/java/android/graphics/ImageDecoder.java +++ b/graphics/java/android/graphics/ImageDecoder.java
@@ -853,6 +853,7 @@ case "image/webp": case "image/gif": case "image/heif": + case "image/heic": case "image/bmp": case "image/x-ico": case "image/vnd.wap.wbmp":