From 46effee5ee0fb61796a58fb1361790d1ad3614c4 Mon Sep 17 00:00:00 2001
From: Sungsoo Lim <sungsoo@google.com>
Date: Thu, 12 Dec 2019 13:40:07 +0900
Subject: [PATCH] Make MediaController.getTag public

Bug: 146527402
Test: build
Change-Id: Iff105885aec205422d34f19fcf51340c6b6cdc71
---
 api/current.txt                                       | 1 +
 media/java/android/media/session/MediaController.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/current.txt b/api/current.txt
index b61917dc55a3a..48dc40d3bfbb2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -27620,6 +27620,7 @@ package android.media.session {
     method @Nullable public android.app.PendingIntent getSessionActivity();
     method @NonNull public android.os.Bundle getSessionInfo();
     method @NonNull public android.media.session.MediaSession.Token getSessionToken();
+    method @NonNull public String getTag();
     method @NonNull public android.media.session.MediaController.TransportControls getTransportControls();
     method public void registerCallback(@NonNull android.media.session.MediaController.Callback);
     method public void registerCallback(@NonNull android.media.session.MediaController.Callback, @Nullable android.os.Handler);
diff --git a/media/java/android/media/session/MediaController.java b/media/java/android/media/session/MediaController.java
index 1fc4f7d59ca58..be99a57ccdfc5 100644
--- a/media/java/android/media/session/MediaController.java
+++ b/media/java/android/media/session/MediaController.java
@@ -443,8 +443,8 @@ public final class MediaController {
      * Get the session's tag for debugging purposes.
      *
      * @return The session's tag.
-     * @hide
      */
+    @NonNull
     public String getTag() {
         if (mTag == null) {
             try {