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

Commit ec6e156d authored by Jin Seok Park's avatar Jin Seok Park Committed by Android (Google) Code Review
Browse files

Merge "Expose XMP offset/size constants as public"

parents f687e273 4b107b19

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -21912,6 +21912,8 @@ package android.media { 
    field public static final int METADATA_KEY_VIDEO_ROTATION = 24; // 0x18

    field public static final int METADATA_KEY_VIDEO_WIDTH = 18; // 0x12

    field public static final int METADATA_KEY_WRITER = 11; // 0xb

    field public static final int METADATA_KEY_XMP_LENGTH = 42; // 0x2a

    field public static final int METADATA_KEY_XMP_OFFSET = 41; // 0x29

    field public static final int METADATA_KEY_YEAR = 8; // 0x8

    field public static final int OPTION_CLOSEST = 3; // 0x3

    field public static final int OPTION_CLOSEST_SYNC = 2; // 0x2

core/api/module-lib-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ package android.media { 


  public class MediaMetadataRetriever implements java.lang.AutoCloseable {

    field public static final int METADATA_KEY_VIDEO_CODEC_MIME_TYPE = 40; // 0x28

    field public static final int METADATA_KEY_XMP_LENGTH = 42; // 0x2a

    field public static final int METADATA_KEY_XMP_OFFSET = 41; // 0x29

  }



  public class MediaServiceManager {

media/java/android/media/MediaMetadataRetriever.java

+0 −4
Original line number Diff line number Diff line
@@ -1374,17 +1374,13 @@ public class MediaMetadataRetriever implements AutoCloseable { 
    /**

     * If the media contains XMP data, this key retrieves the offset (in bytes)

     * of the data.

     * @hide

     */

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int METADATA_KEY_XMP_OFFSET = 41;



    /**

     * If the media contains XMP data, this key retrieves the length (in bytes)

     * of the data.

     * @hide

     */

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int METADATA_KEY_XMP_LENGTH = 42;



    // Add more here...