diff options
| author | Adam Powell <adamp@google.com> | 2012-06-20 22:45:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-20 22:45:09 -0700 |
| commit | a08e6881c58c56aba2ac1f6e02db1529e10f9e6e (patch) | |
| tree | 0f65fcff7ce984c832b8b821d59f1a96ea1ad3e2 /api | |
| parent | 3650ce0479b35e2bfdc549cd0c49f041ddbffc56 (diff) | |
| parent | ed044cda8f6a7600923eecdec682c449f86e0429 (diff) | |
| download | frameworks_base-a08e6881c58c56aba2ac1f6e02db1529e10f9e6e.zip frameworks_base-a08e6881c58c56aba2ac1f6e02db1529e10f9e6e.tar.gz frameworks_base-a08e6881c58c56aba2ac1f6e02db1529e10f9e6e.tar.bz2 | |
am ed044cda: am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-dev
* commit 'ed044cda8f6a7600923eecdec682c449f86e0429':
Expand volume APIs for MediaRouter
Diffstat (limited to 'api')
| -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 4fb41c1..552aa49 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11554,6 +11554,7 @@ package android.media { 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); method public abstract void onRouteUnselected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo); + method public abstract void onRouteVolumeChanged(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); } public static class MediaRouter.RouteCategory { @@ -11589,6 +11590,8 @@ package android.media { method public int getVolume(); method public int getVolumeHandling(); method public int getVolumeMax(); + method public void requestSetVolume(int); + method public void requestUpdateVolume(int); method public void setTag(java.lang.Object); field public static final int PLAYBACK_TYPE_LOCAL = 0; // 0x0 field public static final int PLAYBACK_TYPE_REMOTE = 1; // 0x1 @@ -11605,6 +11608,7 @@ package android.media { method public void onRouteSelected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo); method public void onRouteUngrouped(android.media.MediaRouter, android.media.MediaRouter.RouteInfo, android.media.MediaRouter.RouteGroup); method public void onRouteUnselected(android.media.MediaRouter, int, android.media.MediaRouter.RouteInfo); + method public void onRouteVolumeChanged(android.media.MediaRouter, android.media.MediaRouter.RouteInfo); } public static class MediaRouter.UserRouteInfo extends android.media.MediaRouter.RouteInfo { |