diff options
author | Dianne Hackborn <hackbod@google.com> | 2012-06-12 12:43:20 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-12 12:43:20 -0700 |
commit | 007f2b40f952eab8951c6b22302a59a955a20561 (patch) | |
tree | 463ff4a173547a83b205429481033aa5b75d6ed6 /api/16.txt | |
parent | 823e20284588f785b96764ba24efb7b8f63895d7 (diff) | |
parent | f9d80b6b940540b5d7be22ae310e047fcd2472a8 (diff) | |
download | frameworks_base-007f2b40f952eab8951c6b22302a59a955a20561.zip frameworks_base-007f2b40f952eab8951c6b22302a59a955a20561.tar.gz frameworks_base-007f2b40f952eab8951c6b22302a59a955a20561.tar.bz2 |
am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev
* commit 'f9d80b6b940540b5d7be22ae310e047fcd2472a8':
Rework media router to be per-context with global process state.
Diffstat (limited to 'api/16.txt')
-rw-r--r-- | api/16.txt | 10 |
1 files changed, 5 insertions, 5 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); } |