Merge "Allow empty strings in playFromSearch" into lmp-dev (bcd20f85) · Commits · e / os / android_frameworks_base

media/java/android/media/session/MediaController.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -613,14 +613,18 @@ public final class MediaController {

		/**
		* Request that the player start playback for a specific search query.
		* An empty or null query should be treated as a request to play any
		* music.
		*
		* @param query The search query.
		* @param extras Optional extras that can include extra information about the query.
		* @param extras Optional extras that can include extra information
		* about the query.
		*/
		public void playFromSearch(String query, Bundle extras) {
		if (TextUtils.isEmpty(query)) {
		throw new IllegalArgumentException(
		"You must specify a non-empty search query for playFromSearch.");
		if (query == null) {
		// This is to remain compatible with
		// INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH
		query = "";
		}
		try {
		mSessionBinder.playFromSearch(query, extras);

+4 −1

Original line number	Diff line number	Diff line
		@@ -771,7 +771,10 @@ public final class MediaSession {
		}

		/**
		* Override to handle requests to begin playback from a search query.
		* Override to handle requests to begin playback from a search query. An
		* empty query indicates that the app may play any music. The
		* implementation should attempt to make a smart choice about what to
		* play.
		*/
		public void onPlayFromSearch(String query, Bundle extras) {
		}