summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-09-10 16:36:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-10 16:36:23 +0000
commitd9f4e0cf2c2466d9e05f8562e55d342934f7ed0d (patch)
tree61d396071e36083323a00b779f66875855fe7892 /api/current.txt
parent1d2daa7809b58c226410c0060d7837de0a29888a (diff)
parent596fb8e7969cafdf7f25dfdc97372be4c0950cc3 (diff)
downloadframeworks_base-d9f4e0cf2c2466d9e05f8562e55d342934f7ed0d.zip
frameworks_base-d9f4e0cf2c2466d9e05f8562e55d342934f7ed0d.tar.gz
frameworks_base-d9f4e0cf2c2466d9e05f8562e55d342934f7ed0d.tar.bz2
Merge "AudioTrack.getTimestamp() return type is now boolean" into klp-dev
Diffstat (limited to 'api/current.txt')
-rw-r--r--api/current.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index b8caad8..218b325 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -12172,7 +12172,7 @@ package android.media {
method public int getSampleRate();
method public int getState();
method public int getStreamType();
- method public android.media.AudioTimestamp getTimestamp(android.media.AudioTimestamp);
+ method public boolean getTimestamp(android.media.AudioTimestamp);
method public void pause() throws java.lang.IllegalStateException;
method public void play() throws java.lang.IllegalStateException;
method public void release();