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

Commit 95cb8e40 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make PlaybackInfo implement Parcelable"

parents 738441d3 98e81921

api/current.txt

+4 −1
Original line number Diff line number Diff line
@@ -27148,12 +27148,15 @@ package android.media.session { 
    method public void onSessionEvent(java.lang.String, android.os.Bundle);

  }













  public static final class MediaController.PlaybackInfo {













  public static final class MediaController.PlaybackInfo implements android.os.Parcelable {













    method public int describeContents();















    method public android.media.AudioAttributes getAudioAttributes();















    method public int getCurrentVolume();















    method public int getMaxVolume();















    method public int getPlaybackType();















    method public int getVolumeControl();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.media.session.MediaController.PlaybackInfo> CREATOR;















    field public static final int PLAYBACK_TYPE_LOCAL = 1; // 0x1















    field public static final int PLAYBACK_TYPE_REMOTE = 2; // 0x2















  }

























cmds/media/src/com/android/commands/media/Media.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -24,7 +24,7 @@ import android.media.MediaMetadata;













import android.media.session.ISessionController;















import android.media.session.ISessionControllerCallback;















import android.media.session.ISessionManager;













import android.media.session.ParcelableVolumeInfo;













import android.media.session.MediaController.PlaybackInfo;















import android.media.session.PlaybackState;















import android.os.Bundle;















import android.os.HandlerThread;










@@ -224,7 +224,7 @@ public class Media extends BaseCommand {













        }































        @Override













        public void onVolumeInfoChanged(ParcelableVolumeInfo info) throws RemoteException {













        public void onVolumeInfoChanged(PlaybackInfo info) throws RemoteException {















            System.out.println("onVolumeInfoChanged " + info);















        }

















































media/java/android/media/session/ISessionController.aidl



+2
−2




























Original line number
Diff line number
Diff line








@@ -21,8 +21,8 @@ import android.content.pm.ParceledListSlice;













import android.media.MediaMetadata;















import android.media.Rating;















import android.media.session.ISessionControllerCallback;













import android.media.session.MediaController;















import android.media.session.MediaSession;













import android.media.session.ParcelableVolumeInfo;















import android.media.session.PlaybackState;















import android.net.Uri;















import android.os.Bundle;









@@ -47,7 +47,7 @@ interface ISessionController {













    String getTag();















    PendingIntent getLaunchPendingIntent();















    long getFlags();













    ParcelableVolumeInfo getVolumeAttributes();













    MediaController.PlaybackInfo getVolumeAttributes();















    void adjustVolume(String packageName, String opPackageName,















            in ISessionControllerCallback caller, boolean asSystemService, int direction,















            int flags);

































media/java/android/media/session/ISessionControllerCallback.aidl



+2
−2




























Original line number
Diff line number
Diff line








@@ -17,8 +17,8 @@ package android.media.session;





























import android.content.pm.ParceledListSlice;















import android.media.MediaMetadata;













import android.media.session.ParcelableVolumeInfo;















import android.media.session.PlaybackState;













import android.media.session.MediaController;















import android.media.session.MediaSession;















import android.os.Bundle;

























@@ -35,5 +35,5 @@ oneway interface ISessionControllerCallback {













    void onQueueChanged(in ParceledListSlice queue);















    void onQueueTitleChanged(CharSequence title);















    void onExtrasChanged(in Bundle extras);













    void onVolumeInfoChanged(in ParcelableVolumeInfo info);













    void onVolumeInfoChanged(in MediaController.PlaybackInfo info);















}
























media/java/android/media/session/ParcelableVolumeInfo.aidl→media/java/android/media/session/MediaController.aidl



+1
−1




























Original line number
Diff line number
Diff line








@@ -15,4 +15,4 @@





























package android.media.session;





























parcelable ParcelableVolumeInfo;












parcelable MediaController.PlaybackInfo;