diff options
4 files changed, 6 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 7e2b0ed..703d6bd 100644 --- a/api/current.txt +++ b/api/current.txt @@ -27056,7 +27056,7 @@ package android.service.media { method public abstract android.service.media.MediaBrowserService.BrowserRoot onGetRoot(java.lang.String, int, android.os.Bundle); method public abstract void onLoadChildren(java.lang.String, android.service.media.MediaBrowserService.Result<java.util.List<android.media.browse.MediaBrowser.MediaItem>>); method public void setSessionToken(android.media.session.MediaSession.Token); - field public static final java.lang.String SERVICE_ACTION = "android.media.browse.MediaBrowserService"; + field public static final java.lang.String SERVICE_INTERFACE = "android.media.browse.MediaBrowserService"; } public static final class MediaBrowserService.BrowserRoot { diff --git a/media/java/android/media/browse/MediaBrowser.java b/media/java/android/media/browse/MediaBrowser.java index 338c711..149eaa6 100644 --- a/media/java/android/media/browse/MediaBrowser.java +++ b/media/java/android/media/browse/MediaBrowser.java @@ -136,7 +136,7 @@ public final class MediaBrowser { mState = CONNECT_STATE_CONNECTING; - final Intent intent = new Intent(MediaBrowserService.SERVICE_ACTION); + final Intent intent = new Intent(MediaBrowserService.SERVICE_INTERFACE); intent.setComponent(mServiceComponent); final ServiceConnection thisConnection = mServiceConnection = new MediaServiceConnection(); diff --git a/media/java/android/service/media/MediaBrowserService.java b/media/java/android/service/media/MediaBrowserService.java index 317cb96..d50be42 100644 --- a/media/java/android/service/media/MediaBrowserService.java +++ b/media/java/android/service/media/MediaBrowserService.java @@ -51,7 +51,7 @@ import java.util.List; * </p> * * To extend this class, you must declare the service in your manifest file with - * an intent filter with the {@link #SERVICE_ACTION} action. + * an intent filter with the {@link #SERVICE_INTERFACE} action. * * For example: * </p><pre> @@ -72,7 +72,7 @@ public abstract class MediaBrowserService extends Service { * The {@link Intent} that must be declared as handled by the service. */ @SdkConstant(SdkConstantType.SERVICE_ACTION) - public static final String SERVICE_ACTION = "android.media.browse.MediaBrowserService"; + public static final String SERVICE_INTERFACE = "android.media.browse.MediaBrowserService"; private final ArrayMap<IBinder, ConnectionRecord> mConnections = new ArrayMap(); private final Handler mHandler = new Handler(); @@ -270,7 +270,7 @@ public abstract class MediaBrowserService extends Service { @Override public IBinder onBind(Intent intent) { - if (SERVICE_ACTION.equals(intent.getAction())) { + if (SERVICE_INTERFACE.equals(intent.getAction())) { return mBinder; } return null; diff --git a/tests/MusicBrowserDemo/src/com/example/android/musicbrowserdemo/AppListFragment.java b/tests/MusicBrowserDemo/src/com/example/android/musicbrowserdemo/AppListFragment.java index 50633db..4e18ce9 100644 --- a/tests/MusicBrowserDemo/src/com/example/android/musicbrowserdemo/AppListFragment.java +++ b/tests/MusicBrowserDemo/src/com/example/android/musicbrowserdemo/AppListFragment.java @@ -94,7 +94,7 @@ public class AppListFragment extends ListFragment { // Load the data final PackageManager pm = context.getPackageManager(); - final Intent intent = new Intent(MediaBrowserService.SERVICE_ACTION); + final Intent intent = new Intent(MediaBrowserService.SERVICE_INTERFACE); final List<ResolveInfo> list = pm.queryIntentServices(intent, 0); final int N = list.size(); mItems = new ArrayList(N); |