diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-05-09 17:48:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 17:48:49 +0000 |
| commit | 40cf0590b677e798a8121221b5b1a6c6b36e303b (patch) | |
| tree | c9ad478e5b2fb78a237cf013d4f3ff94bdecccd0 /api | |
| parent | 8ce0279fa5974ce78ba5ea992ed83cbfecfbf4f2 (diff) | |
| parent | 4b0c34600c22f23da98e54a7ab3713290ff4574d (diff) | |
| download | frameworks_base-40cf0590b677e798a8121221b5b1a6c6b36e303b.zip frameworks_base-40cf0590b677e798a8121221b5b1a6c6b36e303b.tar.gz frameworks_base-40cf0590b677e798a8121221b5b1a6c6b36e303b.tar.bz2 | |
am 750a2b05: Merge "Unhide AudioTrack support for ENCODING_PCM_FLOAT"
* commit '750a2b05a54612c6ed2aa8796e659b00bf21caa0':
Unhide AudioTrack support for ENCODING_PCM_FLOAT
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 842d19a..21fba5d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -13374,6 +13374,7 @@ package android.media { field public static final int ENCODING_INVALID = 0; // 0x0 field public static final int ENCODING_PCM_16BIT = 2; // 0x2 field public static final int ENCODING_PCM_8BIT = 3; // 0x3 + field public static final int ENCODING_PCM_FLOAT = 4; // 0x4 } public class AudioManager { @@ -13591,6 +13592,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(float[], int, 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 |