summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2013-05-10 12:46:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-10 12:46:36 -0700
commitc08d4d99e2ee96a18880b4d4818af1d8ed4ebf0a (patch)
tree3c605f20092df8d51a80892de205a7e4db4955b4 /api
parent0bab11cfff6bd3d7e955acb7b103e8935b471617 (diff)
parent1d3488cba90bea114c9c5e8f0d4a008d2aa34bfd (diff)
downloadframeworks_base-c08d4d99e2ee96a18880b4d4818af1d8ed4ebf0a.zip
frameworks_base-c08d4d99e2ee96a18880b4d4818af1d8ed4ebf0a.tar.gz
frameworks_base-c08d4d99e2ee96a18880b4d4818af1d8ed4ebf0a.tar.bz2
am 1d3488cb: am 86e0b491: Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev
* commit '1d3488cba90bea114c9c5e8f0d4a008d2aa34bfd': Add VideoView.getAudioSessionId()
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 84bef4b..8013ac1 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -30008,6 +30008,7 @@ package android.widget {
method public abstract boolean canPause();
method public abstract boolean canSeekBackward();
method public abstract boolean canSeekForward();
+ method public abstract int getAudioSessionId();
method public abstract int getBufferPercentage();
method public abstract int getCurrentPosition();
method public abstract int getDuration();
@@ -31114,6 +31115,7 @@ package android.widget {
method public boolean canPause();
method public boolean canSeekBackward();
method public boolean canSeekForward();
+ method public int getAudioSessionId();
method public int getBufferPercentage();
method public int getCurrentPosition();
method public int getDuration();