summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2013-05-10 16:16:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-10 16:16:45 -0700
commit83d551898d4a441475e9582cd573cebb563a6ef3 (patch)
tree30fa2b3e383af8c0e9b6f4d31000ce348ae9d379 /api
parent24f18fc85005fa11bcebc2775f7b88b22662a708 (diff)
parentf8e54846146c234aa9a201f54eea70df93ee56e2 (diff)
downloadframeworks_base-83d551898d4a441475e9582cd573cebb563a6ef3.zip
frameworks_base-83d551898d4a441475e9582cd573cebb563a6ef3.tar.gz
frameworks_base-83d551898d4a441475e9582cd573cebb563a6ef3.tar.bz2
am f8e54846: am 9766caed: Merge "Add an API to determine if a route is connecting." into jb-mr2-dev
* commit 'f8e54846146c234aa9a201f54eea70df93ee56e2': Add an API to determine if a route is connecting.
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 762b3b6..0994df2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -12335,6 +12335,7 @@ package android.media {
method public int getVolume();
method public int getVolumeHandling();
method public int getVolumeMax();
+ method public boolean isConnecting();
method public boolean isEnabled();
method public void requestSetVolume(int);
method public void requestUpdateVolume(int);