diff options
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | media/java/android/media/browse/MediaBrowser.aidl | 18 | ||||
| -rw-r--r-- | media/java/android/media/browse/MediaBrowser.java | 5 | ||||
| -rw-r--r-- | tests/MusicServiceDemo/src/com/example/android/musicservicedemo/BrowserService.java | 4 |
5 files changed, 26 insertions, 6 deletions
@@ -496,8 +496,11 @@ aidl_files := \ frameworks/base/location/java/android/location/FusedBatchOptions.aidl \ frameworks/base/location/java/com/android/internal/location/ProviderProperties.aidl \ frameworks/base/location/java/com/android/internal/location/ProviderRequest.aidl \ + frameworks/base/media/java/android/media/AudioAttributes.aidl \ + frameworks/base/media/java/android/media/MediaDescription.aidl \ frameworks/base/media/java/android/media/MediaMetadata.aidl \ frameworks/base/media/java/android/media/Rating.aidl \ + frameworks/base/media/java/android/media/browse/MediaBrowser.aidl \ frameworks/base/media/java/android/media/routing/MediaRouteSelector.aidl \ frameworks/base/media/java/android/media/session/MediaSession.aidl \ frameworks/base/media/java/android/media/session/PlaybackState.aidl \ diff --git a/api/current.txt b/api/current.txt index 1006e7d..8700406 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16287,7 +16287,7 @@ package android.media.browse { } public static class MediaBrowser.MediaItem implements android.os.Parcelable { - ctor public MediaBrowser.MediaItem(int, android.media.MediaDescription); + ctor public MediaBrowser.MediaItem(android.media.MediaDescription, int); method public int describeContents(); method public android.media.MediaDescription getDescription(); method public int getFlags(); diff --git a/media/java/android/media/browse/MediaBrowser.aidl b/media/java/android/media/browse/MediaBrowser.aidl new file mode 100644 index 0000000..782e094 --- /dev/null +++ b/media/java/android/media/browse/MediaBrowser.aidl @@ -0,0 +1,18 @@ +/* Copyright 2014, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + +package android.media.browse; + +parcelable MediaBrowser.MediaItem;
\ No newline at end of file diff --git a/media/java/android/media/browse/MediaBrowser.java b/media/java/android/media/browse/MediaBrowser.java index 149eaa6..34713e7 100644 --- a/media/java/android/media/browse/MediaBrowser.java +++ b/media/java/android/media/browse/MediaBrowser.java @@ -544,12 +544,11 @@ public final class MediaBrowser { /** * Create a new MediaItem for use in browsing media. - * - * @param flags The flags for this item. * @param description The description of the media, which must include a * media id. + * @param flags The flags for this item. */ - public MediaItem(@Flags int flags, @NonNull MediaDescription description) { + public MediaItem(@NonNull MediaDescription description, @Flags int flags) { if (description == null) { throw new IllegalArgumentException("description cannot be null"); } diff --git a/tests/MusicServiceDemo/src/com/example/android/musicservicedemo/BrowserService.java b/tests/MusicServiceDemo/src/com/example/android/musicservicedemo/BrowserService.java index a216a32..4e2e47e 100644 --- a/tests/MusicServiceDemo/src/com/example/android/musicservicedemo/BrowserService.java +++ b/tests/MusicServiceDemo/src/com/example/android/musicservicedemo/BrowserService.java @@ -134,8 +134,8 @@ public class BrowserService extends MediaBrowserService { bob.setSubtitle("Summary " + i); bob.setMediaId(Uri.withAppendedPath(BASE_URI, Integer.toString(i)).toString()); - list.add(new MediaBrowser.MediaItem(MediaBrowser.MediaItem.FLAG_BROWSABLE, - bob.build())); + list.add(new MediaBrowser.MediaItem(bob.build(), + MediaBrowser.MediaItem.FLAG_BROWSABLE)); } result.sendResult(list); |