From a7f3187943cf4f6b2f09630574ac85d42ca9ff22 Mon Sep 17 00:00:00 2001
From: Robert Shih <robertshih@google.com>
Date: Wed, 10 Mar 2021 21:37:44 -0800
Subject: [PATCH] Unhide MediaDrm#getPlaybackComponent

Bug: 159337195
Bug: 168341163
CTS-Coverage-Bug: 168341163
Test: atest MediaDrmTest#testSetPlaybackId
Change-Id: I1362db29ddcd511df9aa8f0ae55adfff0aeaafe7
---
 core/api/current.txt                   | 1 +
 core/api/test-current.txt              | 4 ----
 media/java/android/media/MediaDrm.java | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index ece1ce64d928d..336ed39cc12b8 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -21892,6 +21892,7 @@ package android.media {
     method @NonNull public java.util.List<byte[]> getOfflineLicenseKeySetIds();
     method public int getOfflineLicenseState(@NonNull byte[]);
     method public int getOpenSessionCount();
+    method @Nullable public android.media.metrics.PlaybackComponent getPlaybackComponent(@NonNull byte[]);
     method @NonNull public byte[] getPropertyByteArray(String);
     method @NonNull public String getPropertyString(@NonNull String);
     method @NonNull public android.media.MediaDrm.ProvisionRequest getProvisionRequest();
diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index 86949e05ba71e..1d71e7734f998 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -1368,10 +1368,6 @@ package android.media {
     method public int getMaxMacroBlocks();
   }
 
-  public final class MediaDrm implements java.lang.AutoCloseable {
-    method @Nullable public android.media.metrics.PlaybackComponent getPlaybackComponent(@NonNull byte[]);
-  }
-
   public final class MediaRoute2Info implements android.os.Parcelable {
     method @NonNull public String getOriginalId();
   }
diff --git a/media/java/android/media/MediaDrm.java b/media/java/android/media/MediaDrm.java
index 548b415fce74e..ae64c026fb514 100644
--- a/media/java/android/media/MediaDrm.java
+++ b/media/java/android/media/MediaDrm.java
@@ -21,7 +21,6 @@ import android.annotation.IntDef;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.StringDef;
-import android.annotation.TestApi;
 import android.app.ActivityThread;
 import android.app.Application;
 import android.compat.annotation.UnsupportedAppUsage;
@@ -2937,9 +2936,7 @@ public final class MediaDrm implements AutoCloseable {
      * @return a {@link PlaybackComponent} associated with the session,
      * or {@code null} if the session is closed or does not exist.
      * @see PlaybackComponent
-     * @hide
      */
-    @TestApi
     @Nullable
     public PlaybackComponent getPlaybackComponent(@NonNull byte[] sessionId) {
         if (sessionId == null) {