summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2014-05-08 15:58:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-08 15:58:46 +0000
commit96567e2112779458de283d4bf8c16f4de2d604c7 (patch)
tree79cea56ce14d059eeda278b8e545471f2b8df5ef /media
parent5b554f010358d8f47e31d92a42aa3edc4a71ec47 (diff)
parenta713814f17ccbf5bb63d1fbb75bc5cda7a0cc641 (diff)
downloadframeworks_base-96567e2112779458de283d4bf8c16f4de2d604c7.zip
frameworks_base-96567e2112779458de283d4bf8c16f4de2d604c7.tar.gz
frameworks_base-96567e2112779458de283d4bf8c16f4de2d604c7.tar.bz2
Merge "Unhide AudioTrack.write() method for non-blocking and ByteBuffer"
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/AudioTrack.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java
index 1899685..4fe4eb8 100644
--- a/media/java/android/media/AudioTrack.java
+++ b/media/java/android/media/AudioTrack.java
@@ -172,13 +172,11 @@ public class AudioTrack
public @interface WriteMode {}
/**
- * @hide CANDIDATE FOR PUBLIC API
* The write mode indicating the write operation will block until all data has been written,
* to be used in {@link #write(ByteBuffer, int, int, int)}.
*/
public final static int WRITE_BLOCKING = 0;
/**
- * @hide CANDIDATE FOR PUBLIC API
* The write mode indicating the write operation will return immediately after
* queuing as much audio data for playback as possible without blocking, to be used in
* {@link #write(ByteBuffer, int, int, int)}.
@@ -1220,7 +1218,6 @@ public class AudioTrack
/**
- * @hide CANDIDATE FOR PUBLIC API
* Writes the audio data to the audio sink for playback (streaming mode),
* or copies audio data for later playback (static buffer mode).
* In static buffer mode, copies the data to the buffer starting at its 0 offset, and the write