diff options
| author | Andy Hung <hunga@google.com> | 2015-04-17 20:38:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-17 20:38:24 +0000 |
| commit | eaa388bc2c4259e4d9c887af2aca0aa4ce50b08e (patch) | |
| tree | 5d89d41df323da8bf5c4d0fe33eef1ba6806a8a7 /api | |
| parent | 601462f23df12125bcb977a6904a5f7227c64410 (diff) | |
| parent | 4aacc903e3f0216a1aec00d57d34f902025d5bd0 (diff) | |
| download | frameworks_base-eaa388bc2c4259e4d9c887af2aca0aa4ce50b08e.zip frameworks_base-eaa388bc2c4259e4d9c887af2aca0aa4ce50b08e.tar.gz frameworks_base-eaa388bc2c4259e4d9c887af2aca0aa4ce50b08e.tar.bz2 | |
Merge "Add non-blocking writes to AudioTrack"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 1ce0f57..7016cf9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15001,7 +15001,9 @@ package android.media { method public int setVolume(float); method public void stop() throws java.lang.IllegalStateException; method public int write(byte[], int, int); + method public int write(byte[], int, int, int); method public int write(short[], int, int); + method public int write(short[], int, int, int); method public int write(float[], int, int, int); method public int write(java.nio.ByteBuffer, int, int); field public static final int ERROR = -1; // 0xffffffff diff --git a/api/system-current.txt b/api/system-current.txt index 322a04d..34a9905 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -16213,7 +16213,9 @@ package android.media { method public int setVolume(float); method public void stop() throws java.lang.IllegalStateException; method public int write(byte[], int, int); + method public int write(byte[], int, int, int); method public int write(short[], int, int); + method public int write(short[], int, int, int); method public int write(float[], int, int, int); method public int write(java.nio.ByteBuffer, int, int); field public static final int ERROR = -1; // 0xffffffff |