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

Commit 455dac3a authored by Hyundo Moon's avatar Hyundo Moon Committed by android-build-merger
Browse files

Merge changes from topic "MediaSessionManager_isTrustedForMediaControl" into pi-dev 

am: 7a3593d0

Change-Id: Ibed8ed024743a05584d1a07e0fd4554f42833606
parents d82ddbde 7a3593d0

api/current.txt

+10 −0
Original line number Diff line number Diff line
@@ -25758,6 +25758,7 @@ package android.media.session { 
  public final class MediaSession {

    ctor public MediaSession(android.content.Context, java.lang.String);

    method public android.media.session.MediaController getController();

    method public android.media.session.MediaSessionManager.RemoteUserInfo getCurrentControllerInfo();

    method public android.media.session.MediaSession.Token getSessionToken();

    method public boolean isActive();

    method public void release();
@@ -25824,6 +25825,7 @@ package android.media.session { 
    method public void addOnActiveSessionsChangedListener(android.media.session.MediaSessionManager.OnActiveSessionsChangedListener, android.content.ComponentName);

    method public void addOnActiveSessionsChangedListener(android.media.session.MediaSessionManager.OnActiveSessionsChangedListener, android.content.ComponentName, android.os.Handler);

    method public java.util.List<android.media.session.MediaController> getActiveSessions(android.content.ComponentName);

    method public boolean isTrustedForMediaControl(android.media.session.MediaSessionManager.RemoteUserInfo);

    method public void removeOnActiveSessionsChangedListener(android.media.session.MediaSessionManager.OnActiveSessionsChangedListener);

  }









@@ -25831,6 +25833,13 @@ package android.media.session {













    method public abstract void onActiveSessionsChanged(java.util.List<android.media.session.MediaController>);















  }



























  public static final class MediaSessionManager.RemoteUserInfo {













    ctor public MediaSessionManager.RemoteUserInfo(java.lang.String, int, int);













    method public java.lang.String getPackageName();













    method public int getPid();













    method public int getUid();













  }



























  public final class PlaybackState implements android.os.Parcelable {















    method public int describeContents();















    method public long getActions();










@@ -39168,6 +39177,7 @@ package android.service.media {













    ctor public MediaBrowserService();















    method public void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);















    method public final android.os.Bundle getBrowserRootHints();













    method public final android.media.session.MediaSessionManager.RemoteUserInfo getCurrentBrowserInfo();















    method public android.media.session.MediaSession.Token getSessionToken();















    method public void notifyChildrenChanged(java.lang.String);















    method public void notifyChildrenChanged(java.lang.String, android.os.Bundle);

























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



+4
−4




























Original line number
Diff line number
Diff line








@@ -264,13 +264,13 @@ public class Media extends BaseCommand {













                    } else if ("q".equals(line) || "quit".equals(line)) {















                        break;















                    } else if ("play".equals(line)) {













                        mController.play();













                        mController.play("");















                    } else if ("pause".equals(line)) {













                        mController.pause();













                        mController.pause("");















                    } else if ("next".equals(line)) {













                        mController.next();













                        mController.next("");















                    } else if ("previous".equals(line)) {













                        mController.previous();













                        mController.previous("");















                    } else {















                        System.out.println("Invalid command: " + line);















                    }

































media/java/android/media/session/ISession.aidl



+0
−2




























Original line number
Diff line number
Diff line








@@ -50,6 +50,4 @@ interface ISession {













    void setPlaybackToLocal(in AudioAttributes attributes);















    void setPlaybackToRemote(int control, int max);















    void setCurrentVolume(int currentVolume);



























    String getCallingPackage();















}
























media/java/android/media/session/ISessionCallback.aidl



+25
−22




























Original line number
Diff line number
Diff line








@@ -25,30 +25,33 @@ import android.os.ResultReceiver;













 * @hide















 */















oneway interface ISessionCallback {













    void onCommand(String command, in Bundle args, in ResultReceiver cb);













    void onMediaButton(in Intent mediaButtonIntent, int sequenceNumber, in ResultReceiver cb);













    void onCommand(String packageName, int pid, int uid, String command, in Bundle args,













            in ResultReceiver cb);













    void onMediaButton(String packageName, int pid, int uid, in Intent mediaButtonIntent,













            int sequenceNumber, in ResultReceiver cb);































    // These callbacks are for the TransportPerformer













    void onPrepare();













    void onPrepareFromMediaId(String mediaId, in Bundle extras);













    void onPrepareFromSearch(String query, in Bundle extras);













    void onPrepareFromUri(in Uri uri, in Bundle extras);













    void onPlay();













    void onPlayFromMediaId(String mediaId, in Bundle extras);













    void onPlayFromSearch(String query, in Bundle extras);













    void onPlayFromUri(in Uri uri, in Bundle extras);













    void onSkipToTrack(long id);













    void onPause();













    void onStop();













    void onNext();













    void onPrevious();













    void onFastForward();













    void onRewind();













    void onSeekTo(long pos);













    void onRate(in Rating rating);













    void onCustomAction(String action, in Bundle args);













    void onPrepare(String packageName, int pid, int uid);













    void onPrepareFromMediaId(String packageName, int pid, int uid, String mediaId,













            in Bundle extras);













    void onPrepareFromSearch(String packageName, int pid, int uid, String query, in Bundle extras);













    void onPrepareFromUri(String packageName, int pid, int uid, in Uri uri, in Bundle extras);













    void onPlay(String packageName, int pid, int uid);













    void onPlayFromMediaId(String packageName, int pid, int uid, String mediaId, in Bundle extras);













    void onPlayFromSearch(String packageName, int pid, int uid, String query, in Bundle extras);













    void onPlayFromUri(String packageName, int pid, int uid, in Uri uri, in Bundle extras);













    void onSkipToTrack(String packageName, int pid, int uid, long id);













    void onPause(String packageName, int pid, int uid);













    void onStop(String packageName, int pid, int uid);













    void onNext(String packageName, int pid, int uid);













    void onPrevious(String packageName, int pid, int uid);













    void onFastForward(String packageName, int pid, int uid);













    void onRewind(String packageName, int pid, int uid);













    void onSeekTo(String packageName, int pid, int uid, long pos);













    void onRate(String packageName, int pid, int uid, in Rating rating);













    void onCustomAction(String packageName, int pid, int uid, String action, in Bundle args);































    // These callbacks are for volume handling













    void onAdjustVolume(int direction);













    void onSetVolumeTo(int value);













    void onAdjustVolume(String packageName, int pid, int uid, int direction);













    void onSetVolumeTo(String packageName, int pid, int uid, int value);















}
























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



+22
−22




























Original line number
Diff line number
Diff line








@@ -36,8 +36,8 @@ import java.util.List;













 * @hide















 */















interface ISessionController {













    void sendCommand(String command, in Bundle args, in ResultReceiver cb);













    boolean sendMediaButton(in KeyEvent mediaButton);













    void sendCommand(String packageName, String command, in Bundle args, in ResultReceiver cb);













    boolean sendMediaButton(String packageName, in KeyEvent mediaButton);















    void registerCallbackListener(in ISessionControllerCallback cb);















    void unregisterCallbackListener(in ISessionControllerCallback cb);















    boolean isTransportControlEnabled();









@@ -46,28 +46,28 @@ interface ISessionController {













    PendingIntent getLaunchPendingIntent();















    long getFlags();















    ParcelableVolumeInfo getVolumeAttributes();













    void adjustVolume(int direction, int flags, String packageName);













    void setVolumeTo(int value, int flags, String packageName);













    void adjustVolume(String packageName, int direction, int flags);













    void setVolumeTo(String packageName, int value, int flags);































    // These commands are for the TransportControls













    void prepare();













    void prepareFromMediaId(String mediaId, in Bundle extras);













    void prepareFromSearch(String string, in Bundle extras);













    void prepareFromUri(in Uri uri, in Bundle extras);













    void play();













    void playFromMediaId(String mediaId, in Bundle extras);













    void playFromSearch(String string, in Bundle extras);













    void playFromUri(in Uri uri, in Bundle extras);













    void skipToQueueItem(long id);













    void pause();













    void stop();













    void next();













    void previous();













    void fastForward();













    void rewind();













    void seekTo(long pos);













    void rate(in Rating rating);













    void sendCustomAction(String action, in Bundle args);













    void prepare(String packageName);













    void prepareFromMediaId(String packageName, String mediaId, in Bundle extras);













    void prepareFromSearch(String packageName, String string, in Bundle extras);













    void prepareFromUri(String packageName, in Uri uri, in Bundle extras);













    void play(String packageName);













    void playFromMediaId(String packageName, String mediaId, in Bundle extras);













    void playFromSearch(String packageName, String string, in Bundle extras);













    void playFromUri(String packageName, in Uri uri, in Bundle extras);













    void skipToQueueItem(String packageName, long id);













    void pause(String packageName);













    void stop(String packageName);













    void next(String packageName);













    void previous(String packageName);













    void fastForward(String packageName);













    void rewind(String packageName);













    void seekTo(String packageName, long pos);













    void rate(String packageName, in Rating rating);













    void sendCustomAction(String packageName, String action, in Bundle args);















    MediaMetadata getMetadata();















    PlaybackState getPlaybackState();















    ParceledListSlice getQueue();