diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2014-05-08 16:04:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-08 16:04:07 +0000 |
| commit | 9b128af442c49df1eb9358b912ec4651b9968eeb (patch) | |
| tree | 5d87f75963410977d91693f89811f00d27c9f897 /api | |
| parent | 2714bdfdc185846e0dac6f008037a3e33fbdd8ef (diff) | |
| parent | 96567e2112779458de283d4bf8c16f4de2d604c7 (diff) | |
| download | frameworks_base-9b128af442c49df1eb9358b912ec4651b9968eeb.zip frameworks_base-9b128af442c49df1eb9358b912ec4651b9968eeb.tar.gz frameworks_base-9b128af442c49df1eb9358b912ec4651b9968eeb.tar.bz2 | |
am 720f52c1: Merge "Unhide AudioTrack.write() method for non-blocking and ByteBuffer"
* commit '720f52c13af94e73ffcb3156a6e0a9999d017637':
Unhide AudioTrack.write() method for non-blocking and ByteBuffer
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 0e87ee9..1870f86 100644 --- a/api/current.txt +++ b/api/current.txt @@ -13584,6 +13584,7 @@ package android.media { method public void stop() throws java.lang.IllegalStateException; method public int write(byte[], int, int); method public int write(short[], int, int); + method public int write(java.nio.ByteBuffer, int, int); field public static final int ERROR = -1; // 0xffffffff field public static final int ERROR_BAD_VALUE = -2; // 0xfffffffe field public static final int ERROR_INVALID_OPERATION = -3; // 0xfffffffd @@ -13596,6 +13597,8 @@ package android.media { field public static final int STATE_NO_STATIC_DATA = 2; // 0x2 field public static final int STATE_UNINITIALIZED = 0; // 0x0 field public static final int SUCCESS = 0; // 0x0 + field public static final int WRITE_BLOCKING = 0; // 0x0 + field public static final int WRITE_NON_BLOCKING = 1; // 0x1 } public static abstract interface AudioTrack.OnPlaybackPositionUpdateListener { |