diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-10-29 13:37:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-29 13:37:10 -0700 |
| commit | 46a0ec73b6d4a81dd037d7beef7321f25349bf9c (patch) | |
| tree | ec179925fe22e8b7365ee1a0cda788eb1d3d4f8a /api/current.txt | |
| parent | 1b38ea484b3b474a6fcdfd817ec7234fb0596b98 (diff) | |
| parent | 14012e1d1b3c96048955e22d2bb73b9c63189a54 (diff) | |
| download | frameworks_base-46a0ec73b6d4a81dd037d7beef7321f25349bf9c.zip frameworks_base-46a0ec73b6d4a81dd037d7beef7321f25349bf9c.tar.gz frameworks_base-46a0ec73b6d4a81dd037d7beef7321f25349bf9c.tar.bz2 | |
am 14012e1d: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
* commit '14012e1d1b3c96048955e22d2bb73b9c63189a54':
Add MediaRouter API to get presentation display.
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 85ae413..e26d8f0 100644 --- a/api/current.txt +++ b/api/current.txt @@ -10093,8 +10093,10 @@ package android.hardware.display { public final class DisplayManager { method public android.view.Display getDisplay(int); method public android.view.Display[] getDisplays(); + method public android.view.Display[] getDisplays(java.lang.String); method public void registerDisplayListener(android.hardware.display.DisplayManager.DisplayListener, android.os.Handler); method public void unregisterDisplayListener(android.hardware.display.DisplayManager.DisplayListener); + field public static final java.lang.String DISPLAY_CATEGORY_PRESENTATION = "android.hardware.display.category.PRESENTATION"; } public static abstract interface DisplayManager.DisplayListener { @@ -11768,6 +11770,7 @@ package android.media { method public abstract void onRouteAdded(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); method public abstract void onRouteChanged(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); method public abstract void onRouteGrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup, int); + method public void onRoutePresentationDisplayChanged(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); method public abstract void onRouteRemoved(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); method public abstract void onRouteSelected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo); method public abstract void onRouteUngrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup); @@ -11802,6 +11805,7 @@ package android.media { method public java.lang.CharSequence getName(android.content.Context); method public int getPlaybackStream(); method public int getPlaybackType(); + method public android.view.Display getPresentationDisplay(); method public java.lang.CharSequence getStatus(); method public int getSupportedTypes(); method public java.lang.Object getTag(); |