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

Commit 8eee83e5 authored by Hyundo Moon's avatar Hyundo Moon
Browse files

Introduce SessionCallbackLink 

In order to avoid direct AIDL usages in framework, this CL introduces a
new class SessionCallbackLink which can prevent usages of
ISessionCallback.

Also, this CL renames ControllerCallbackLink.asBinder() to
ControllerCallbackLink.getBinder().

Bug: 121239657
Test: make update-api -j / make -j
      atest CtsMediaTestCases:android.media.cts.MediaSessionTest
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest
Change-Id: Icbcc4b045b1f6933c63d0d87aedc23b28c03d2de
parent 1ebc3f0d

api/system-current.txt

+59 −1
Original line number Diff line number Diff line
@@ -3162,8 +3162,8 @@ package android.media.session { 


  public final class ControllerCallbackLink implements android.os.Parcelable {

    ctor public ControllerCallbackLink(android.media.session.ControllerCallbackLink.CallbackStub);

    method public android.os.IBinder asBinder();

    method public int describeContents();

    method public android.os.IBinder getBinder();

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

    method public void notifyExtrasChanged(android.os.Bundle);

    method public void notifyMetadataChanged(android.media.MediaMetadata);
@@ -3201,6 +3201,64 @@ package android.media.session { 
    method public abstract void onVolumeKeyLongPress(android.view.KeyEvent);

  }



  public final class SessionCallbackLink implements android.os.Parcelable {

    ctor public SessionCallbackLink(android.media.session.SessionCallbackLink.CallbackStub);

    method public int describeContents();

    method public android.os.IBinder getBinder();

    method public void notifyAdjustVolume(java.lang.String, int, int, android.media.session.ControllerCallbackLink, int);

    method public void notifyCommand(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle, android.os.ResultReceiver);

    method public void notifyCustomAction(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle);

    method public void notifyFastForward(java.lang.String, int, int, android.media.session.ControllerCallbackLink);

    method public void notifyMediaButton(java.lang.String, int, int, android.content.Intent, int, android.os.ResultReceiver);

    method public void notifyMediaButtonFromController(java.lang.String, int, int, android.media.session.ControllerCallbackLink, android.content.Intent);

    method public void notifyNext(java.lang.String, int, int, android.media.session.ControllerCallbackLink);

    method public void notifyPause(java.lang.String, int, int, android.media.session.ControllerCallbackLink);

    method public void notifyPlay(java.lang.String, int, int, android.media.session.ControllerCallbackLink);

    method public void notifyPlayFromMediaId(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle);

    method public void notifyPlayFromSearch(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle);

    method public void notifyPlayFromUri(java.lang.String, int, int, android.media.session.ControllerCallbackLink, android.net.Uri, android.os.Bundle);

    method public void notifyPrepare(java.lang.String, int, int, android.media.session.ControllerCallbackLink);

    method public void notifyPrepareFromMediaId(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle);

    method public void notifyPrepareFromSearch(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle);

    method public void notifyPrepareFromUri(java.lang.String, int, int, android.media.session.ControllerCallbackLink, android.net.Uri, android.os.Bundle);

    method public void notifyPrevious(java.lang.String, int, int, android.media.session.ControllerCallbackLink);

    method public void notifyRate(java.lang.String, int, int, android.media.session.ControllerCallbackLink, android.media.Rating);

    method public void notifyRewind(java.lang.String, int, int, android.media.session.ControllerCallbackLink);

    method public void notifySeekTo(java.lang.String, int, int, android.media.session.ControllerCallbackLink, long);

    method public void notifySetVolumeTo(java.lang.String, int, int, android.media.session.ControllerCallbackLink, int);

    method public void notifySkipToTrack(java.lang.String, int, int, android.media.session.ControllerCallbackLink, long);

    method public void notifyStop(java.lang.String, int, int, android.media.session.ControllerCallbackLink);

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

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

  }



  public static abstract class SessionCallbackLink.CallbackStub {

    ctor public SessionCallbackLink.CallbackStub();

    method public void onAdjustVolume(java.lang.String, int, int, android.media.session.ControllerCallbackLink, int);

    method public void onCommand(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle, android.os.ResultReceiver);

    method public void onCustomAction(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle);

    method public void onFastForward(java.lang.String, int, int, android.media.session.ControllerCallbackLink);

    method public void onMediaButton(java.lang.String, int, int, android.content.Intent, int, android.os.ResultReceiver);

    method public void onMediaButtonFromController(java.lang.String, int, int, android.media.session.ControllerCallbackLink, android.content.Intent);

    method public void onNext(java.lang.String, int, int, android.media.session.ControllerCallbackLink);

    method public void onPause(java.lang.String, int, int, android.media.session.ControllerCallbackLink);

    method public void onPlay(java.lang.String, int, int, android.media.session.ControllerCallbackLink);

    method public void onPlayFromMediaId(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle);

    method public void onPlayFromSearch(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle);

    method public void onPlayFromUri(java.lang.String, int, int, android.media.session.ControllerCallbackLink, android.net.Uri, android.os.Bundle);

    method public void onPrepare(java.lang.String, int, int, android.media.session.ControllerCallbackLink);

    method public void onPrepareFromMediaId(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle);

    method public void onPrepareFromSearch(java.lang.String, int, int, android.media.session.ControllerCallbackLink, java.lang.String, android.os.Bundle);

    method public void onPrepareFromUri(java.lang.String, int, int, android.media.session.ControllerCallbackLink, android.net.Uri, android.os.Bundle);

    method public void onPrevious(java.lang.String, int, int, android.media.session.ControllerCallbackLink);

    method public void onRate(java.lang.String, int, int, android.media.session.ControllerCallbackLink, android.media.Rating);

    method public void onRewind(java.lang.String, int, int, android.media.session.ControllerCallbackLink);

    method public void onSeekTo(java.lang.String, int, int, android.media.session.ControllerCallbackLink, long);

    method public void onSetVolumeTo(java.lang.String, int, int, android.media.session.ControllerCallbackLink, int);

    method public void onSkipToTrack(java.lang.String, int, int, android.media.session.ControllerCallbackLink, long);

    method public void onStop(java.lang.String, int, int, android.media.session.ControllerCallbackLink);

  }



}



package android.media.soundtrigger {

media/java/android/media/Session2Token.java

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public final class Session2Token implements Parcelable { 
        dest.writeString(mPackageName);

        dest.writeString(mServiceName);

        // TODO: Uncomment below

        //dest.writeStrongBinder(mSessionLink.asBinder());

        //dest.writeStrongBinder(mSessionLink.getBinder());

        dest.writeString(mComponentName == null ? "" : mComponentName.flattenToString());

    }

media/java/android/media/session/ControllerCallbackLink.java

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ public final class ControllerCallbackLink implements Parcelable { 
    }



    /** Gets the binder */

    public IBinder asBinder() {

    public IBinder getBinder() {

        return mIControllerCallback.asBinder();

    }

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

+26 −26
Original line number Diff line number Diff line
@@ -26,46 +26,46 @@ import android.os.ResultReceiver; 
 * @hide

 */

oneway interface ISessionCallback {

    void onCommand(String packageName, int pid, int uid, in ControllerCallbackLink caller,

    void notifyCommand(String packageName, int pid, int uid, in ControllerCallbackLink caller,

            String command, in Bundle args, in ResultReceiver cb);

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

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

            int sequenceNumber, in ResultReceiver cb);

    void onMediaButtonFromController(String packageName, int pid, int uid,

    void notifyMediaButtonFromController(String packageName, int pid, int uid,

            in ControllerCallbackLink caller, in Intent mediaButtonIntent);



    // These callbacks are for the TransportPerformer

    void onPrepare(String packageName, int pid, int uid, in ControllerCallbackLink caller);

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

    void notifyPrepare(String packageName, int pid, int uid, in ControllerCallbackLink caller);

    void notifyPrepareFromMediaId(String packageName, int pid, int uid,

            in ControllerCallbackLink caller, String mediaId, in Bundle extras);

    void onPrepareFromSearch(String packageName, int pid, int uid,

    void notifyPrepareFromSearch(String packageName, int pid, int uid,

            in ControllerCallbackLink caller, String query, in Bundle extras);

    void onPrepareFromUri(String packageName, int pid, int uid, in ControllerCallbackLink caller,

            in Uri uri, in Bundle extras);

    void onPlay(String packageName, int pid, int uid, in ControllerCallbackLink caller);

    void onPlayFromMediaId(String packageName, int pid, int uid, in ControllerCallbackLink caller,

            String mediaId, in Bundle extras);

    void onPlayFromSearch(String packageName, int pid, int uid, in ControllerCallbackLink caller,

            String query, in Bundle extras);

    void onPlayFromUri(String packageName, int pid, int uid, in ControllerCallbackLink caller,

    void notifyPrepareFromUri(String packageName, int pid, int uid,

            in ControllerCallbackLink caller, in Uri uri, in Bundle extras);

    void notifyPlay(String packageName, int pid, int uid, in ControllerCallbackLink caller);

    void notifyPlayFromMediaId(String packageName, int pid, int uid,

            in ControllerCallbackLink caller, String mediaId, in Bundle extras);

    void notifyPlayFromSearch(String packageName, int pid, int uid,

            in ControllerCallbackLink caller, String query, in Bundle extras);

    void notifyPlayFromUri(String packageName, int pid, int uid, in ControllerCallbackLink caller,

            in Uri uri, in Bundle extras);

    void onSkipToTrack(String packageName, int pid, int uid, in ControllerCallbackLink caller,

    void notifySkipToTrack(String packageName, int pid, int uid, in ControllerCallbackLink caller,

            long id);

    void onPause(String packageName, int pid, int uid, in ControllerCallbackLink caller);

    void onStop(String packageName, int pid, int uid, in ControllerCallbackLink caller);

    void onNext(String packageName, int pid, int uid, in ControllerCallbackLink caller);

    void onPrevious(String packageName, int pid, int uid, in ControllerCallbackLink caller);

    void onFastForward(String packageName, int pid, int uid, in ControllerCallbackLink caller);

    void onRewind(String packageName, int pid, int uid, in ControllerCallbackLink caller);

    void onSeekTo(String packageName, int pid, int uid, in ControllerCallbackLink caller,

    void notifyPause(String packageName, int pid, int uid, in ControllerCallbackLink caller);

    void notifyStop(String packageName, int pid, int uid, in ControllerCallbackLink caller);

    void notifyNext(String packageName, int pid, int uid, in ControllerCallbackLink caller);

    void notifyPrevious(String packageName, int pid, int uid, in ControllerCallbackLink caller);

    void notifyFastForward(String packageName, int pid, int uid, in ControllerCallbackLink caller);

    void notifyRewind(String packageName, int pid, int uid, in ControllerCallbackLink caller);

    void notifySeekTo(String packageName, int pid, int uid, in ControllerCallbackLink caller,

            long pos);

    void onRate(String packageName, int pid, int uid, in ControllerCallbackLink caller,

    void notifyRate(String packageName, int pid, int uid, in ControllerCallbackLink caller,

            in Rating rating);

    void onCustomAction(String packageName, int pid, int uid, in ControllerCallbackLink caller,

    void notifyCustomAction(String packageName, int pid, int uid, in ControllerCallbackLink caller,

            String action, in Bundle args);



    // These callbacks are for volume handling

    void onAdjustVolume(String packageName, int pid, int uid, in ControllerCallbackLink caller,

    void notifyAdjustVolume(String packageName, int pid, int uid, in ControllerCallbackLink caller,

            int direction);

    void onSetVolumeTo(String packageName, int pid, int uid,

    void notifySetVolumeTo(String packageName, int pid, int uid,

            in ControllerCallbackLink caller, int value);

}

media/java/android/media/session/ISessionManager.aidl

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.media.session.ICallback; 
import android.media.session.IOnMediaKeyListener;

import android.media.session.IOnVolumeKeyLongPressListener;

import android.media.session.ISession;

import android.media.session.ISessionCallback;

import android.media.session.SessionCallbackLink;

import android.os.Bundle;

import android.view.KeyEvent;
@@ -31,7 +31,7 @@ import android.view.KeyEvent; 
 * @hide

 */

interface ISessionManager {

    ISession createSession(String packageName, in ISessionCallback cb, String tag, int userId);

    ISession createSession(String packageName, in SessionCallbackLink cb, String tag, int userId);

    List<IBinder> getSessions(in ComponentName compName, int userId);

    void dispatchMediaKeyEvent(String packageName, boolean asSystemService, in KeyEvent keyEvent,

            boolean needWakeLock);