diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-06-11 15:08:39 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2012-06-11 15:41:08 -0700 |
| commit | b58b8f832d06b0ffa8886eba5a4916578a3b8743 (patch) | |
| tree | 46c116da0e9c0f7fb6b9403b18771bdffe8760d9 /api | |
| parent | fbce66cb259cb63b43fda654db68152b8b4a2c2f (diff) | |
| download | frameworks_base-b58b8f832d06b0ffa8886eba5a4916578a3b8743.zip frameworks_base-b58b8f832d06b0ffa8886eba5a4916578a3b8743.tar.gz frameworks_base-b58b8f832d06b0ffa8886eba5a4916578a3b8743.tar.bz2 | |
Rework media router to be per-context with global process state.
Change-Id: Ic1cb6f13e691d22783bcdafae85b7c75aec0a66f
Diffstat (limited to 'api')
| -rw-r--r-- | api/16.txt | 10 | ||||
| -rw-r--r-- | api/current.txt | 10 |
2 files changed, 10 insertions, 10 deletions
@@ -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); } diff --git a/api/current.txt b/api/current.txt index bcbccda..c95de36 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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); } |