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

Commit d0bb9eab authored by Jaewan Kim's avatar Jaewan Kim Committed by Android (Google) Code Review
Browse files

Merge changes Ib3c350ba,I9f6b17a6 

* changes:
  MediaController: Make getTag() public
  MediaRouter: Remove hidden annotation usages
parents 06540cf9 be68aae2

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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);

media/apex/java/android/media/session/MediaController.java

+0 −1
Original line number Diff line number Diff line
@@ -486,7 +486,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) {

media/java/android/media/MediaRouter.java

+2 −4
Original line number Diff line number Diff line
@@ -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);

            }