Merge "Fix regression in CTS for AudioTrack" into lmp-dev

2014-09-03 18:31:58 +00:00
parent 94b88e7103 c56b808591
commit 49367a367c
1 changed files with 1 additions and 1 deletions
--- a/media/java/android/media/AudioTrack.java
+++ b/media/java/android/media/AudioTrack.java
@@ -1286,7 +1286,7 @@ public class AudioTrack

    public int write(short[] audioData, int offsetInShorts, int sizeInShorts) {

-        if (mState == STATE_UNINITIALIZED || mAudioFormat != AudioFormat.ENCODING_PCM_16BIT) {
+        if (mState == STATE_UNINITIALIZED || mAudioFormat == AudioFormat.ENCODING_PCM_FLOAT) {
            return ERROR_INVALID_OPERATION;
        }