From cab79f7d5982bda4e80821b6620c3249764c613f Mon Sep 17 00:00:00 2001 From: Sungsoo Lim Date: Mon, 21 Nov 2016 04:48:51 +0000 Subject: [PATCH] Revert "MediaBrowserService: Add a constant for suggestion keywords" This reverts commit 43635ca3f7d12be129feba9256da9fb878e65bb2. Change-Id: I328f7e0add71c54cc4806810f784732ff17a16bb --- api/current.txt | 1 - api/system-current.txt | 1 - api/test-current.txt | 1 - .../service/media/MediaBrowserService.java | 26 ------------------- 4 files changed, 29 deletions(-) diff --git a/api/current.txt b/api/current.txt index cbba5dd230e2b..701b0b48f1487 100644 --- a/api/current.txt +++ b/api/current.txt @@ -34697,7 +34697,6 @@ package android.service.media { field public static final java.lang.String EXTRA_OFFLINE = "android.service.media.extra.OFFLINE"; field public static final java.lang.String EXTRA_RECENT = "android.service.media.extra.RECENT"; field public static final java.lang.String EXTRA_SUGGESTED = "android.service.media.extra.SUGGESTED"; - field public static final java.lang.String EXTRA_SUGGESTION_KEYWORDS = "android.service.media.extra.SUGGESTION_KEYWORDS"; } public class MediaBrowserService.Result { diff --git a/api/system-current.txt b/api/system-current.txt index f5c96d0859f75..c5ee96dc88080 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -37445,7 +37445,6 @@ package android.service.media { field public static final java.lang.String EXTRA_OFFLINE = "android.service.media.extra.OFFLINE"; field public static final java.lang.String EXTRA_RECENT = "android.service.media.extra.RECENT"; field public static final java.lang.String EXTRA_SUGGESTED = "android.service.media.extra.SUGGESTED"; - field public static final java.lang.String EXTRA_SUGGESTION_KEYWORDS = "android.service.media.extra.SUGGESTION_KEYWORDS"; } public class MediaBrowserService.Result { diff --git a/api/test-current.txt b/api/test-current.txt index e7636e80fb2c5..9ec48ed255cba 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -34774,7 +34774,6 @@ package android.service.media { field public static final java.lang.String EXTRA_OFFLINE = "android.service.media.extra.OFFLINE"; field public static final java.lang.String EXTRA_RECENT = "android.service.media.extra.RECENT"; field public static final java.lang.String EXTRA_SUGGESTED = "android.service.media.extra.SUGGESTED"; - field public static final java.lang.String EXTRA_SUGGESTION_KEYWORDS = "android.service.media.extra.SUGGESTION_KEYWORDS"; } public class MediaBrowserService.Result { diff --git a/media/java/android/service/media/MediaBrowserService.java b/media/java/android/service/media/MediaBrowserService.java index a811ad0e5a1f9..6321b7b9e287b 100644 --- a/media/java/android/service/media/MediaBrowserService.java +++ b/media/java/android/service/media/MediaBrowserService.java @@ -363,7 +363,6 @@ public abstract class MediaBrowserService extends Service { * @see BrowserRoot#EXTRA_RECENT * @see BrowserRoot#EXTRA_OFFLINE * @see BrowserRoot#EXTRA_SUGGESTED - * @see BrowserRoot#EXTRA_SUGGESTION_KEYWORDS */ public abstract @Nullable BrowserRoot onGetRoot(@NonNull String clientPackageName, int clientUid, @Nullable Bundle rootHints); @@ -501,7 +500,6 @@ public abstract class MediaBrowserService extends Service { * @see MediaBrowserService.BrowserRoot#EXTRA_RECENT * @see MediaBrowserService.BrowserRoot#EXTRA_OFFLINE * @see MediaBrowserService.BrowserRoot#EXTRA_SUGGESTED - * @see MediaBrowserService.BrowserRoot#EXTRA_SUGGESTION_KEYWORDS */ public final Bundle getBrowserRootHints() { if (mCurConnection == null) { @@ -737,7 +735,6 @@ public abstract class MediaBrowserService extends Service { * * @see #EXTRA_OFFLINE * @see #EXTRA_SUGGESTED - * @see #EXTRA_SUGGESTION_KEYWORDS */ public static final String EXTRA_RECENT = "android.service.media.extra.RECENT"; @@ -755,7 +752,6 @@ public abstract class MediaBrowserService extends Service { * * @see #EXTRA_RECENT * @see #EXTRA_SUGGESTED - * @see #EXTRA_SUGGESTION_KEYWORDS */ public static final String EXTRA_OFFLINE = "android.service.media.extra.OFFLINE"; @@ -774,31 +770,9 @@ public abstract class MediaBrowserService extends Service { * * @see #EXTRA_RECENT * @see #EXTRA_OFFLINE - * @see #EXTRA_SUGGESTION_KEYWORDS */ public static final String EXTRA_SUGGESTED = "android.service.media.extra.SUGGESTED"; - /** - * The lookup key for a string that indicates specific keywords which will be considered - * when the browser service suggests media items. - * - *

When creating a media browser for a given media browser service, this key can be - * supplied as a root hint together with {@link #EXTRA_SUGGESTED} for retrieving suggested - * media items related with the keywords. The list of media items passed in - * {@link android.media.browse.MediaBrowser.SubscriptionCallback#onChildrenLoaded(String, List)} - * is considered ordered by relevance, first being the top suggestion. - * If the media browser service can provide such media items, the implementation must return - * the key in the root hint when {@link #onGetRoot(String, int, Bundle)} is called back. - * - *

The root hint may contain multiple keys. - * - * @see #EXTRA_RECENT - * @see #EXTRA_OFFLINE - * @see #EXTRA_SUGGESTED - */ - public static final String EXTRA_SUGGESTION_KEYWORDS - = "android.service.media.extra.SUGGESTION_KEYWORDS"; - final private String mRootId; final private Bundle mExtras;