From 4b107b19e6f5cd718a7861f6e35bb7456304ed09 Mon Sep 17 00:00:00 2001
From: Jin Seok Park <jinpark@google.com>
Date: Wed, 23 Dec 2020 01:37:09 +0900
Subject: [PATCH] Expose XMP offset/size constants as public

These constants need to be public in order for AndroidX ExifInterface
to be able to access it.

Bug: 159373092
Test: update-api
Change-Id: Ibfe4bb95287e8f6d432e17e1b96cbb7a3237c540
---
 core/api/current.txt                                 | 2 ++
 core/api/module-lib-current.txt                      | 2 --
 media/java/android/media/MediaMetadataRetriever.java | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 8c8361a1c3f60..a6d434d0c8af8 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -21894,6 +21894,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
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt
index 8e99d3c7882dc..cbb3bea6327e4 100644
--- a/core/api/module-lib-current.txt
+++ b/core/api/module-lib-current.txt
@@ -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
   }
 
 }
diff --git a/media/java/android/media/MediaMetadataRetriever.java b/media/java/android/media/MediaMetadataRetriever.java
index 32a916838c002..c13f610a908c8 100644
--- a/media/java/android/media/MediaMetadataRetriever.java
+++ b/media/java/android/media/MediaMetadataRetriever.java
@@ -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...