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

Merge "MediaBorwserService: Update javadoc" into nyc-dev

Browse Source 
am: bb71aed9ac

* commit 'bb71aed9ac1fd608044e398c1719536b188661c1':
  MediaBorwserService: Update javadoc
This commit is contained in:
Sungsoo Lim
2016-03-04 05:57:09 +00:00
committed by android-build-merger
parent 64dfbf3bae bb71aed9ac
commit f58507f892
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -370,15 +370,14 @@ public abstract class MediaBrowserService extends Service {
* called when the loading is complete. * called when the loading is complete.
* </p><p> * </p><p>
* In case the media item does not have any children, call {@link Result#sendResult} * In case the media item does not have any children, call {@link Result#sendResult}
* with an empty list which is not {@code null}. If {@code null} is sent that means * with an empty list. When the given {@code parentId} is invalid, implementations must
* the given {@code parentId} is invalid and {@link MediaBrowser.SubscriptionCallback#onError} * call {@link Result#sendResult result.sendResult} with {@code null}, which will invoke
* will be called. * {@link MediaBrowser.SubscriptionCallback#onError}.
* </p> * </p>
* *
* @param parentId The id of the parent media item whose children are to be * @param parentId The id of the parent media item whose children are to be
* queried. * queried.
* @param result The Result to send the list of children to. Send null if the * @param result The Result to send the list of children to.
* id is invalid.
*/ */
public abstract void onLoadChildren(@NonNull String parentId, public abstract void onLoadChildren(@NonNull String parentId,
@NonNull Result<List<MediaBrowser.MediaItem>> result); @NonNull Result<List<MediaBrowser.MediaItem>> result);
@@ -394,15 +393,14 @@ public abstract class MediaBrowserService extends Service {
* called when the loading is complete. * called when the loading is complete.
* </p><p> * </p><p>
* In case the media item does not have any children, call {@link Result#sendResult} * In case the media item does not have any children, call {@link Result#sendResult}
* with an empty list which is not {@code null}. If {@code null} is sent that means * with an empty list. When the given {@code parentId} is invalid, implementations must
* the given {@code parentId} is invalid and {@link MediaBrowser.SubscriptionCallback#onError} * call {@link Result#sendResult result.sendResult} with {@code null}, which will invoke
* will be called. * {@link MediaBrowser.SubscriptionCallback#onError}.
* </p> * </p>
* *
* @param parentId The id of the parent media item whose children are to be * @param parentId The id of the parent media item whose children are to be
* queried. * queried.
* @param result The Result to send the list of children to. Send null if the * @param result The Result to send the list of children to.
* id is invalid.
* @param options A bundle of service-specific arguments sent from the media * @param options A bundle of service-specific arguments sent from the media
* browse. The information returned through the result should be * browse. The information returned through the result should be
* affected by the contents of this bundle. * affected by the contents of this bundle.
@@ -424,13 +422,18 @@ public abstract class MediaBrowserService extends Service {
* result.detach} may be called before returning from this function, and * result.detach} may be called before returning from this function, and
* then {@link Result#sendResult result.sendResult} called when the item has * then {@link Result#sendResult result.sendResult} called when the item has
* been loaded. * been loaded.
* <p> * </p><p>
* The default implementation sends a null result. * When the given {@code itemId} is invalid, implementations must call
* {@link Result#sendResult result.sendResult} with {@code null}, which will
* invoke {@link MediaBrowser.ItemCallback#onError}.
* </p><p>
* The default implementation calls {@link Result#sendResult result.sendResult}
* with {@code null}.
* </p>
* *
* @param itemId The id for the specific * @param itemId The id for the specific
* {@link android.media.browse.MediaBrowser.MediaItem}. * {@link android.media.browse.MediaBrowser.MediaItem}.
* @param result The Result to send the item to. Send null if the id is * @param result The Result to send the item to.
* invalid.
*/ */
public void onLoadItem(String itemId, Result<MediaBrowser.MediaItem> result) { public void onLoadItem(String itemId, Result<MediaBrowser.MediaItem> result) {
result.sendResult(null); result.sendResult(null);