diff options
| author | Adam Powell <adamp@google.com> | 2012-06-20 22:35:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-20 22:35:44 -0700 |
| commit | ed044cda8f6a7600923eecdec682c449f86e0429 (patch) | |
| tree | 4490dcec1420a23271655221ec11d2c17e174989 /api | |
| parent | 071ed3348739cb3f2bb9ef169067440c8c61b881 (diff) | |
| parent | 09829b71de3a84cb9d1bc0d8aad78dd16daadddf (diff) | |
| download | frameworks_base-ed044cda8f6a7600923eecdec682c449f86e0429.zip frameworks_base-ed044cda8f6a7600923eecdec682c449f86e0429.tar.gz frameworks_base-ed044cda8f6a7600923eecdec682c449f86e0429.tar.bz2 | |
am 09829b71: Merge "Expand volume APIs for MediaRouter" into jb-dev
* commit '09829b71de3a84cb9d1bc0d8aad78dd16daadddf':
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 9de53d2..9916e18 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11538,6 +11538,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 { @@ -11573,6 +11574,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 @@ -11589,6 +11592,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 { |