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

Commit 3e9bfcf8 authored by Gyumin Sim's avatar Gyumin Sim Committed by Android (Google) Code Review
Browse files

Merge changes I6aebd812,I0dc6a99a 

* changes:
  Remove obsolete method in IMediaBrowserServiceCallbacks
  Remove an import in MediaBrowser
parents 47cdc972 7bf786f5

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

+3 −10
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.content.Intent; 
import android.content.ServiceConnection;

import android.content.pm.ParceledListSlice;

import android.media.MediaDescription;

import android.media.session.MediaController;

import android.media.session.MediaSession;

import android.os.Binder;

import android.os.Bundle;
@@ -757,8 +756,8 @@ public final class MediaBrowser { 
         * Flag: Indicates that the item is playable.

         * <p>

         * The id of this item may be passed to

         * {@link MediaController.TransportControls#playFromMediaId(String, Bundle)}

         * to start playing it.

         * {@link android.media.session.MediaController.TransportControls

         * #playFromMediaId(String, Bundle)} to start playing it.

         * </p>

         */

        public static final int FLAG_PLAYABLE = 1 << 1;
@@ -1107,13 +1106,7 @@ public final class MediaBrowser { 
        }



        @Override

        public void onLoadChildren(String parentId, ParceledListSlice list) {

            onLoadChildrenWithOptions(parentId, list, null);

        }



        @Override

        public void onLoadChildrenWithOptions(String parentId, ParceledListSlice list,

                final Bundle options) {

        public void onLoadChildren(String parentId, ParceledListSlice list, Bundle options) {

            MediaBrowser mediaBrowser = mMediaBrowser.get();

            if (mediaBrowser != null) {

                mediaBrowser.onLoadChildren(this, parentId, list, options);

media/java/android/service/media/IMediaBrowserServiceCallbacks.aidl

+1 −3
Original line number Diff line number Diff line
@@ -23,7 +23,5 @@ oneway interface IMediaBrowserServiceCallbacks { 
    void onConnect(String root, in MediaSession.Token session, in Bundle extras);

    @UnsupportedAppUsage

    void onConnectFailed();

    void onLoadChildren(String mediaId, in ParceledListSlice list);

    void onLoadChildrenWithOptions(String mediaId, in ParceledListSlice list,

            in Bundle options);

    void onLoadChildren(String mediaId, in ParceledListSlice list, in Bundle options);

}

media/java/android/service/media/MediaBrowserService.java

+1 −1
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ public abstract class MediaBrowserService extends Service { 
                final ParceledListSlice<MediaBrowser.MediaItem> pls =

                        filteredList == null ? null : new ParceledListSlice<>(filteredList);

                try {

                    connection.callbacks.onLoadChildrenWithOptions(parentId, pls, options);

                    connection.callbacks.onLoadChildren(parentId, pls, options);

                } catch (RemoteException ex) {

                    // The other side is in the process of crashing.

                    Log.w(TAG, "Calling onLoadChildren() failed for id=" + parentId