Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cb16792 authored by Emilian Peev's avatar Emilian Peev Committed by Automerger Merge Worker
Browse files

Merge "ImageFormat: Update the Jpeg/R format documentation" into udc-dev am:... 

Merge "ImageFormat: Update the Jpeg/R format documentation" into udc-dev am: fd74bd19 am: c5023ec9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22723280



Change-Id: I48b06dda852b1ffd74a1de900e775af22cb791d8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b025088f c5023ec9

graphics/java/android/graphics/ImageFormat.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -261,8 +261,9 @@ public class ImageFormat { 
    /**

    /**

     * Compressed JPEG format that includes an embedded recovery map.

     * Compressed JPEG format that includes an embedded recovery map.

     *

     *

     * <p>JPEG compressed main image along with XMP embedded recovery map

     * <p>JPEG compressed main image along with embedded recovery map following the

     * following ISO TBD.</p>

     * <a href="https://developer.android.com/guide/topics/media/hdr-image-format">Ultra HDR

     * Image format specification</a>.</p>

     */

     */

    public static final int JPEG_R = 0x1005;

    public static final int JPEG_R = 0x1005;