Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Ib3c350ba,I9f6b17a6

Browse Source 
* changes:
  MediaController: Make getTag() public
  MediaRouter: Remove hidden annotation usages
This commit is contained in:
Jaewan Kim
2019-01-29 07:38:46 +00:00
committed by Android (Google) Code Review
parent 06540cf94f be68aae2bb
commit d0bb9eab0d
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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);

1
media/apex/java/android/media/session/MediaController.java
View File

@@ -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) {

6
media/java/android/media/MediaRouter.java
View File

@@ -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);
}