am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev (007f2b40) · Commits · e / os / android_frameworks_base

api/16.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -5336,6 +5336,7 @@ package android.content {
		field public static final java.lang.String KEYGUARD_SERVICE = "keyguard";
		field public static final java.lang.String LAYOUT_INFLATER_SERVICE = "layout_inflater";
		field public static final java.lang.String LOCATION_SERVICE = "location";
		field public static final java.lang.String MEDIA_ROUTER_SERVICE = "media_router";
		field public static final int MODE_APPEND = 32768; // 0x8000
		field public static final int MODE_ENABLE_WRITE_AHEAD_LOGGING = 8; // 0x8
		field public static final int MODE_MULTI_PROCESS = 4; // 0x4
		@@ -11511,7 +11512,6 @@ package android.media {
		method public void clearUserRoutes();
		method public android.media.MediaRouter.RouteCategory createRouteCategory(java.lang.CharSequence, boolean);
		method public android.media.MediaRouter.UserRouteInfo createUserRoute(android.media.MediaRouter.RouteCategory);
		method public static android.media.MediaRouter forApplication(android.content.Context);
		method public android.media.MediaRouter.RouteCategory getCategoryAt(int);
		method public int getCategoryCount();
		method public android.media.MediaRouter.RouteInfo getRouteAt(int);
		@@ -11534,14 +11534,14 @@ package android.media {
		method public abstract void onRouteUnselected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);
		}

		public class MediaRouter.RouteCategory {
		public static class MediaRouter.RouteCategory {
		method public java.lang.CharSequence getName();
		method public java.util.List<android.media.MediaRouter.RouteInfo> getRoutes(java.util.List<android.media.MediaRouter.RouteInfo>);
		method public int getSupportedTypes();
		method public boolean isGroupable();
		}

		public class MediaRouter.RouteGroup extends android.media.MediaRouter.RouteInfo {
		public static class MediaRouter.RouteGroup extends android.media.MediaRouter.RouteInfo {
		method public void addRoute(android.media.MediaRouter.RouteInfo);
		method public void addRoute(android.media.MediaRouter.RouteInfo, int);
		method public android.media.MediaRouter.RouteInfo getRouteAt(int);
		@@ -11550,7 +11550,7 @@ package android.media {
		method public void removeRoute(int);
		}

		public class MediaRouter.RouteInfo {
		public static class MediaRouter.RouteInfo {
		method public android.media.MediaRouter.RouteCategory getCategory();
		method public android.media.MediaRouter.RouteGroup getGroup();
		method public java.lang.CharSequence getName();
		@@ -11569,7 +11569,7 @@ package android.media {
		method public void onRouteUnselected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);
		}

		public class MediaRouter.UserRouteInfo extends android.media.MediaRouter.RouteInfo {
		public static class MediaRouter.UserRouteInfo extends android.media.MediaRouter.RouteInfo {
		method public void setName(java.lang.CharSequence);
		method public void setStatus(java.lang.CharSequence);
		}

api/current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -5336,6 +5336,7 @@ package android.content {
		field public static final java.lang.String KEYGUARD_SERVICE = "keyguard";
		field public static final java.lang.String LAYOUT_INFLATER_SERVICE = "layout_inflater";
		field public static final java.lang.String LOCATION_SERVICE = "location";
		field public static final java.lang.String MEDIA_ROUTER_SERVICE = "media_router";
		field public static final int MODE_APPEND = 32768; // 0x8000
		field public static final int MODE_ENABLE_WRITE_AHEAD_LOGGING = 8; // 0x8
		field public static final int MODE_MULTI_PROCESS = 4; // 0x4
		@@ -11511,7 +11512,6 @@ package android.media {
		method public void clearUserRoutes();
		method public android.media.MediaRouter.RouteCategory createRouteCategory(java.lang.CharSequence, boolean);
		method public android.media.MediaRouter.UserRouteInfo createUserRoute(android.media.MediaRouter.RouteCategory);
		method public static android.media.MediaRouter forApplication(android.content.Context);
		method public android.media.MediaRouter.RouteCategory getCategoryAt(int);
		method public int getCategoryCount();
		method public android.media.MediaRouter.RouteInfo getRouteAt(int);
		@@ -11534,14 +11534,14 @@ package android.media {
		method public abstract void onRouteUnselected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);
		}

		public class MediaRouter.RouteCategory {
		public static class MediaRouter.RouteCategory {
		method public java.lang.CharSequence getName();
		method public java.util.List<android.media.MediaRouter.RouteInfo> getRoutes(java.util.List<android.media.MediaRouter.RouteInfo>);
		method public int getSupportedTypes();
		method public boolean isGroupable();
		}

		public class MediaRouter.RouteGroup extends android.media.MediaRouter.RouteInfo {
		public static class MediaRouter.RouteGroup extends android.media.MediaRouter.RouteInfo {
		method public void addRoute(android.media.MediaRouter.RouteInfo);
		method public void addRoute(android.media.MediaRouter.RouteInfo, int);
		method public android.media.MediaRouter.RouteInfo getRouteAt(int);
		@@ -11550,7 +11550,7 @@ package android.media {
		method public void removeRoute(int);
		}

		public class MediaRouter.RouteInfo {
		public static class MediaRouter.RouteInfo {
		method public android.media.MediaRouter.RouteCategory getCategory();
		method public android.media.MediaRouter.RouteGroup getGroup();
		method public java.lang.CharSequence getName();
		@@ -11569,7 +11569,7 @@ package android.media {
		method public void onRouteUnselected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo);
		}

		public class MediaRouter.UserRouteInfo extends android.media.MediaRouter.RouteInfo {
		public static class MediaRouter.UserRouteInfo extends android.media.MediaRouter.RouteInfo {
		method public void setName(java.lang.CharSequence);
		method public void setStatus(java.lang.CharSequence);
		}

core/java/android/app/ContextImpl.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ import android.location.ICountryDetector;
		import android.location.ILocationManager;
		import android.location.LocationManager;
		import android.media.AudioManager;
		import android.media.MediaRouter;
		import android.net.ConnectivityManager;
		import android.net.IConnectivityManager;
		import android.net.INetworkPolicyManager;
		@@ -288,6 +289,11 @@ class ContextImpl extends Context {
		return new AudioManager(ctx);
		}});

		registerService(MEDIA_ROUTER_SERVICE, new ServiceFetcher() {
		public Object createService(ContextImpl ctx) {
		return new MediaRouter(ctx);
		}});

		registerService(CLIPBOARD_SERVICE, new ServiceFetcher() {
		public Object createService(ContextImpl ctx) {
		return new ClipboardManager(ctx.getOuterContext(),

core/java/android/app/MediaRouteActionProvider.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ public class MediaRouteActionProvider extends ActionProvider {
		public MediaRouteActionProvider(Context context) {
		super(context);
		mContext = context;
		mRouter = MediaRouter.forApplication(context);
		mRouter = (MediaRouter)context.getSystemService(Context.MEDIA_ROUTER_SERVICE);

		// Start with live audio by default.
		// TODO Update this when new route types are added; segment by API level

core/java/android/app/MediaRouteButton.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ public class MediaRouteButton extends View {
		public MediaRouteButton(Context context, AttributeSet attrs, int defStyleAttr) {
		super(context, attrs, defStyleAttr);

		mRouter = MediaRouter.forApplication(context);
		mRouter = (MediaRouter)context.getSystemService(Context.MEDIA_ROUTER_SERVICE);

		TypedArray a = context.obtainStyledAttributes(attrs,
		com.android.internal.R.styleable.MediaRouteButton, defStyleAttr, 0);