Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I6aebd812,I0dc6a99a

Browse Source 
* changes:
  Remove obsolete method in IMediaBrowserServiceCallbacks
  Remove an import in MediaBrowser
This commit is contained in:
Gyumin Sim
2020-07-23 07:58:54 +00:00
committed by Android (Google) Code Review
parent 47cdc97211 7bf786f574
commit 3e9bfcf84f
3 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
media/java/android/media/browse/MediaBrowser.java
View File

@@ -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);

4
media/java/android/service/media/IMediaBrowserServiceCallbacks.aidl
View File

@@ -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);
}

2
media/java/android/service/media/MediaBrowserService.java
View File

@@ -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