diff --git a/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java index eeb0cef683..737ce8d7dc 100644 --- a/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java +++ b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java @@ -201,16 +201,8 @@ public class WebRtcAudioRecord { int bufferSizeInBytes = Math.max(BUFFER_SIZE_FACTOR * minBufferSize, byteBuffer.capacity()); Logging.d(TAG, "bufferSizeInBytes: " + bufferSizeInBytes); try { - if (WebRtcAudioUtils.runningOnMarshmallowOrHigher()) { - // Use AudioRecord.Builder to create the AudioRecord instance if we are - // on API level 23 or higher. - audioRecord = createAudioRecordOnMarshmallowOrHigher( - sampleRate, channelConfig, bufferSizeInBytes); - } else { - // Use default constructor for API levels below 23. - audioRecord = new AudioRecord(audioSource, sampleRate, channelConfig, - AudioFormat.ENCODING_PCM_16BIT, bufferSizeInBytes); - } + audioRecord = new AudioRecord(audioSource, sampleRate, channelConfig, + AudioFormat.ENCODING_PCM_16BIT, bufferSizeInBytes); } catch (IllegalArgumentException e) { reportWebRtcAudioRecordInitError("AudioRecord ctor error: " + e.getMessage()); releaseAudioResources(); @@ -284,22 +276,6 @@ public class WebRtcAudioRecord { } } - // Creates an AudioRecord instance using AudioRecord.Builder. - @TargetApi(23) - private AudioRecord createAudioRecordOnMarshmallowOrHigher( - int sampleRateInHz, int channelConfig, int bufferSizeInBytes) { - Logging.d(TAG, "createAudioRecordOnMarshmallowOrHigher"); - return new AudioRecord.Builder() - .setAudioSource(audioSource) - .setAudioFormat(new AudioFormat.Builder() - .setEncoding(AudioFormat.ENCODING_PCM_16BIT) - .setSampleRate(sampleRateInHz) - .setChannelMask(channelConfig) - .build()) - .setBufferSizeInBytes(bufferSizeInBytes) - .build(); - } - // Helper method which throws an exception when an assertion has failed. private static void assertTrue(boolean condition) { if (!condition) {