Merge "Revert "MediaBrowserService: Add a constant for suggestion keywords"" (cc2a4210) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -35456,7 +35456,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<T> {

api/system-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -38355,7 +38355,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<T> {

api/test-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -35575,7 +35575,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<T> {

media/java/android/service/media/MediaBrowserService.java

+0 −26

Original line number	Diff line number	Diff line
		@@ -387,7 +387,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);
		@@ -550,7 +549,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) {
		@@ -818,7 +816,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";

		@@ -836,7 +833,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";

		@@ -855,31 +851,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.
		*
		* <p>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.
		*
		* <p>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;