From 36a0ff35fb3a57ef376924034a5d13d722d63440 Mon Sep 17 00:00:00 2001
From: Jaewan Kim <jaewan@google.com>
Date: Mon, 28 Jan 2019 10:20:06 +0900
Subject: [PATCH 1/2] MediaRouter: Remove hidden annotation usages

This removes hidden annotation usages from the framework to the apex,
which would be prohibited.

Test: Build
Bug: 123485698
Change-Id: I9f6b17a61c5438e0d538a7a97587c375d8603613
---
 media/java/android/media/MediaRouter.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java
index ffeff4d93d152..3444e92779490 100644
--- a/media/java/android/media/MediaRouter.java
+++ b/media/java/android/media/MediaRouter.java
@@ -2357,8 +2357,7 @@ public class MediaRouter {
                 return;
             }
             if (mPlaybackType == RemoteControlClient.PLAYBACK_TYPE_REMOTE) {
-                @VolumeProvider.ControlType int volumeControl =
-                        VolumeProvider.VOLUME_CONTROL_FIXED;
+                int volumeControl = VolumeProvider.VOLUME_CONTROL_FIXED;
                 switch (mVolumeHandling) {
                     case RemoteControlClient.PLAYBACK_VOLUME_VARIABLE:
                         volumeControl = VolumeProvider.VOLUME_CONTROL_ABSOLUTE;
@@ -2384,8 +2383,7 @@ public class MediaRouter {
 
         class SessionVolumeProvider extends VolumeProvider {
 
-            public SessionVolumeProvider(@VolumeProvider.ControlType int volumeControl,
-                    int maxVolume, int currentVolume) {
+            SessionVolumeProvider(int volumeControl, int maxVolume, int currentVolume) {
                 super(volumeControl, maxVolume, currentVolume);
             }
 

From be68aae2bb5ea1e0d526a0a1d7db08e042b415b1 Mon Sep 17 00:00:00 2001
From: Jaewan Kim <jaewan@google.com>
Date: Mon, 28 Jan 2019 10:24:04 +0900
Subject: [PATCH 2/2] MediaController: Make getTag() public

This removes hidden API usages from the framework to the apex, which
would be prohibited.

Test: Build
Bug: 123485698
Change-Id: Ib3c350bad4af2e8db3788296dc78b7f7eb0693c0
---
 api/current.txt                                            | 1 +
 media/apex/java/android/media/session/MediaController.java | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/current.txt b/api/current.txt
index 58f9105869a8e..8577ce97eefe3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -27355,6 +27355,7 @@ package android.media.session {
     method public int getRatingType();
     method @Nullable public android.app.PendingIntent getSessionActivity();
     method @NonNull public android.media.session.MediaSession.Token getSessionToken();
+    method 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/apex/java/android/media/session/MediaController.java b/media/apex/java/android/media/session/MediaController.java
index 422b18695a360..e7b3c99ff879f 100644
--- a/media/apex/java/android/media/session/MediaController.java
+++ b/media/apex/java/android/media/session/MediaController.java
@@ -485,7 +485,6 @@ public final class MediaController {
      * Get the session's tag for debugging purposes.
      *
      * @return The session's tag.
-     * @hide
      */
     public String getTag() {
         if (mTag == null) {