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

Merge "MediaBrowser: Make support lib v23.x available in N release" into nyc-dev

Browse Source
This commit is contained in:
Jae Seo
2016-05-09 20:32:45 +00:00
committed by Android (Google) Code Review
parent ac29617c6e 6b7bda0bc3
commit c3fc7d4038
4 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -476,6 +476,9 @@ public final class MediaBrowser {
// the service will be told when we connect. // the service will be told when we connect.
if (mState == CONNECT_STATE_CONNECTED) { if (mState == CONNECT_STATE_CONNECTED) {
try { try {
if (options == null) {
mServiceBinder.addSubscriptionDeprecated(parentId, mServiceCallbacks);
}
mServiceBinder.addSubscription(parentId, callback.mToken, options, mServiceBinder.addSubscription(parentId, callback.mToken, options,
mServiceCallbacks); mServiceCallbacks);
} catch (RemoteException ex) { } catch (RemoteException ex) {
@@ -500,6 +503,7 @@ public final class MediaBrowser {
try { try {
if (callback == null) { if (callback == null) {
if (mState == CONNECT_STATE_CONNECTED) { if (mState == CONNECT_STATE_CONNECTED) {
mServiceBinder.removeSubscriptionDeprecated(parentId, mServiceCallbacks);
mServiceBinder.removeSubscription(parentId, null, mServiceCallbacks); mServiceBinder.removeSubscription(parentId, null, mServiceCallbacks);
} }
} else { } else {
@@ -1070,7 +1074,12 @@ public final class MediaBrowser {
} }
@Override @Override
public void onLoadChildren(String parentId, ParceledListSlice list, public void onLoadChildren(String parentId, ParceledListSlice list) {
onLoadChildrenWithOptions(parentId, list, null);
}
@Override
public void onLoadChildrenWithOptions(String parentId, ParceledListSlice list,
final Bundle options) { final Bundle options) {
MediaBrowser mediaBrowser = mMediaBrowser.get(); MediaBrowser mediaBrowser = mMediaBrowser.get();
if (mediaBrowser != null) { if (mediaBrowser != null) {

5
media/java/android/service/media/IMediaBrowserService.aidl
View File

@@ -17,8 +17,11 @@ oneway interface IMediaBrowserService {
void connect(String pkg, in Bundle rootHints, IMediaBrowserServiceCallbacks callbacks); void connect(String pkg, in Bundle rootHints, IMediaBrowserServiceCallbacks callbacks);
void disconnect(IMediaBrowserServiceCallbacks callbacks); void disconnect(IMediaBrowserServiceCallbacks callbacks);
void addSubscriptionDeprecated(String uri, IMediaBrowserServiceCallbacks callbacks);
void removeSubscriptionDeprecated(String uri, IMediaBrowserServiceCallbacks callbacks);
void getMediaItem(String uri, in ResultReceiver cb, IMediaBrowserServiceCallbacks callbacks);
void addSubscription(String uri, in IBinder token, in Bundle options, void addSubscription(String uri, in IBinder token, in Bundle options,
IMediaBrowserServiceCallbacks callbacks); IMediaBrowserServiceCallbacks callbacks);
void removeSubscription(String uri, in IBinder token, IMediaBrowserServiceCallbacks callbacks); void removeSubscription(String uri, in IBinder token, IMediaBrowserServiceCallbacks callbacks);
void getMediaItem(String uri, in ResultReceiver cb, IMediaBrowserServiceCallbacks callbacks);
} }

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

@@ -22,5 +22,6 @@ oneway interface IMediaBrowserServiceCallbacks {
*/ */
void onConnect(String root, in MediaSession.Token session, in Bundle extras); void onConnect(String root, in MediaSession.Token session, in Bundle extras);
void onConnectFailed(); void onConnectFailed();
void onLoadChildren(String mediaId, in ParceledListSlice list, in Bundle options); void onLoadChildren(String mediaId, in ParceledListSlice list);
void onLoadChildrenWithOptions(String mediaId, in ParceledListSlice list, in Bundle options);
} }

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

@@ -248,6 +248,11 @@ public abstract class MediaBrowserService extends Service {
}); });
} }
@Override
public void addSubscriptionDeprecated(String id, IMediaBrowserServiceCallbacks callbacks) {
// do-nothing
}
@Override @Override
public void addSubscription(final String id, final IBinder token, final Bundle options, public void addSubscription(final String id, final IBinder token, final Bundle options,
final IMediaBrowserServiceCallbacks callbacks) { final IMediaBrowserServiceCallbacks callbacks) {
@@ -269,6 +274,11 @@ public abstract class MediaBrowserService extends Service {
}); });
} }
@Override
public void removeSubscriptionDeprecated(String id, IMediaBrowserServiceCallbacks callbacks) {
// do-nothing
}
@Override @Override
public void removeSubscription(final String id, final IBinder token, public void removeSubscription(final String id, final IBinder token,
final IMediaBrowserServiceCallbacks callbacks) { final IMediaBrowserServiceCallbacks callbacks) {
@@ -632,7 +642,7 @@ public abstract class MediaBrowserService extends Service {
final ParceledListSlice<MediaBrowser.MediaItem> pls = final ParceledListSlice<MediaBrowser.MediaItem> pls =
filteredList == null ? null : new ParceledListSlice<>(filteredList); filteredList == null ? null : new ParceledListSlice<>(filteredList);
try { try {
connection.callbacks.onLoadChildren(parentId, pls, options); connection.callbacks.onLoadChildrenWithOptions(parentId, pls, options);
} catch (RemoteException ex) { } catch (RemoteException ex) {
// The other side is in the process of crashing. // The other side is in the process of crashing.
Log.w(TAG, "Calling onLoadChildren() failed for id=" + parentId Log.w(TAG, "Calling onLoadChildren() failed for id=" + parentId