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

Commit bfa6d239 authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Android (Google) Code Review
Browse files

Merge "MediaBrowserService: Provide a way to retrieve root hints" into nyc-dev

parents e54b4397 51ccdb0f

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -34649,6 +34649,7 @@ package android.service.media { 
  public abstract class MediaBrowserService extends android.app.Service {

    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 android.media.session.MediaSession.Token getSessionToken();

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

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

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -37304,6 +37304,7 @@ package android.service.media { 
  public abstract class MediaBrowserService extends android.app.Service {

    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 android.media.session.MediaSession.Token getSessionToken();

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

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

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -34724,6 +34724,7 @@ package android.service.media { 
  public abstract class MediaBrowserService extends android.app.Service {

    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 android.media.session.MediaSession.Token getSessionToken();

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

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

media/java/android/media/browse/MediaBrowser.java

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ public final class MediaBrowser { 
        mContext = context;

        mServiceComponent = serviceComponent;

        mCallback = callback;

        mRootHints = rootHints;

        mRootHints = rootHints == null ? null : new Bundle(rootHints);

    }



    /**
@@ -444,7 +444,7 @@ public final class MediaBrowser { 
            }

        };

        try {

            mServiceBinder.getMediaItem(mediaId, receiver);

            mServiceBinder.getMediaItem(mediaId, receiver, mServiceCallbacks);

        } catch (RemoteException e) {

            Log.i(TAG, "Remote error getting media item.");

            mHandler.post(new Runnable() {

media/java/android/service/media/IMediaBrowserService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -20,5 +20,5 @@ oneway interface IMediaBrowserService { 
    void addSubscription(String uri, in IBinder token, in Bundle options,

            IMediaBrowserServiceCallbacks callbacks);

    void removeSubscription(String uri, in IBinder token, IMediaBrowserServiceCallbacks callbacks);

    void getMediaItem(String uri, in ResultReceiver cb);

    void getMediaItem(String uri, in ResultReceiver cb, IMediaBrowserServiceCallbacks callbacks);

}