From 9d211b7460cc6a71c2fd1be9cbe2f9d7ac35ea65 Mon Sep 17 00:00:00 2001 From: Gyumin Sim Date: Wed, 22 Jul 2020 17:41:00 +0900 Subject: [PATCH 1/2] Remove an import in MediaBrowser The repo hook complains about unused imports because MediaController is not used in code but javadoc. Test: m offline-sdk-docs Change-Id: I0dc6a99a77f344e326c4bbe0c216c4f0f44be696 --- media/java/android/media/browse/MediaBrowser.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/media/java/android/media/browse/MediaBrowser.java b/media/java/android/media/browse/MediaBrowser.java index 3c2be5f93e307..41a0df671aaa1 100644 --- a/media/java/android/media/browse/MediaBrowser.java +++ b/media/java/android/media/browse/MediaBrowser.java @@ -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. *

* 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. *

*/ public static final int FLAG_PLAYABLE = 1 << 1; From 7bf786f574b519a9af703afe42056e3f71d68747 Mon Sep 17 00:00:00 2001 From: Gyumin Sim Date: Wed, 22 Jul 2020 16:49:16 +0900 Subject: [PATCH 2/2] Remove obsolete method in IMediaBrowserServiceCallbacks It removes onLoadChildren because onLoadChildren is not used anymore that is identical to onLoadChildrenWithOptions with null options. It also renames onLoadChildrenWithOptions to onLoadChildren for simpler name. Test: atest CtsMediaTestCases:android.media.cts.MediaBrowserTest \ CtsMediaTestCases:android.media.cts.MediaBrowserServiceTest Change-Id: I6aebd812249cd3a717aa6d2f48e4a40601ef1063 --- media/java/android/media/browse/MediaBrowser.java | 8 +------- .../service/media/IMediaBrowserServiceCallbacks.aidl | 4 +--- media/java/android/service/media/MediaBrowserService.java | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/media/java/android/media/browse/MediaBrowser.java b/media/java/android/media/browse/MediaBrowser.java index 41a0df671aaa1..029e61492b6d5 100644 --- a/media/java/android/media/browse/MediaBrowser.java +++ b/media/java/android/media/browse/MediaBrowser.java @@ -1106,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); diff --git a/media/java/android/service/media/IMediaBrowserServiceCallbacks.aidl b/media/java/android/service/media/IMediaBrowserServiceCallbacks.aidl index 7e3f2f8868fbc..a8772076af977 100644 --- a/media/java/android/service/media/IMediaBrowserServiceCallbacks.aidl +++ b/media/java/android/service/media/IMediaBrowserServiceCallbacks.aidl @@ -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); } diff --git a/media/java/android/service/media/MediaBrowserService.java b/media/java/android/service/media/MediaBrowserService.java index 06adf30a8303d..39c7682a2a742 100644 --- a/media/java/android/service/media/MediaBrowserService.java +++ b/media/java/android/service/media/MediaBrowserService.java @@ -687,7 +687,7 @@ public abstract class MediaBrowserService extends Service { final ParceledListSlice 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