diff options
| author | Adam Powell <adamp@google.com> | 2012-06-15 11:54:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-15 11:54:42 -0700 |
| commit | 15635728a4ff00da6cc3d6468c02d39e5631f124 (patch) | |
| tree | b6ad392bf08fda4f9fa9eb89a95cf3aafabb7cde /api | |
| parent | c82a664ca34885251edcfd044c142ab79e787f9c (diff) | |
| parent | 27db797e37ea16ea5db6eb3f6a32e0f116c1b824 (diff) | |
| download | frameworks_base-15635728a4ff00da6cc3d6468c02d39e5631f124.zip frameworks_base-15635728a4ff00da6cc3d6468c02d39e5631f124.tar.gz frameworks_base-15635728a4ff00da6cc3d6468c02d39e5631f124.tar.bz2 | |
am 27db797e: Merge "Update MediaRouteChooserDialog grouping UI" into jb-dev
* commit '27db797e37ea16ea5db6eb3f6a32e0f116c1b824':
Update MediaRouteChooserDialog grouping UI
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 1bf4b52..81a2eea 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11566,6 +11566,8 @@ package android.media { method public java.lang.CharSequence getName(android.content.Context); method public java.lang.CharSequence getStatus(); method public int getSupportedTypes(); + method public java.lang.Object getTag(); + method public void setTag(java.lang.Object); } public static class MediaRouter.SimpleCallback extends android.media.MediaRouter.Callback { @@ -11580,14 +11582,12 @@ package android.media { } public static class MediaRouter.UserRouteInfo extends android.media.MediaRouter.RouteInfo { - method public java.lang.Object getTag(); method public void setIconDrawable(android.graphics.drawable.Drawable); method public void setIconResource(int); method public void setName(java.lang.CharSequence); method public void setName(int); method public void setRemoteControlClient(android.media.RemoteControlClient); method public void setStatus(java.lang.CharSequence); - method public void setTag(java.lang.Object); } public class MediaScannerConnection implements android.content.ServiceConnection { |