ba221989f06f5278c69ebea1aac7353a5d3724e2 - src/webrtc

commit	ba221989f06f5278c69ebea1aac7353a5d3724e2	[log] [tgz]
author	henrika <henrika@webrtc.org>	Wed Oct 28 12:06:15 2015
committer	henrika <henrika@webrtc.org>	Wed Oct 28 12:06:24 2015
tree	7b8bc5012694e7bd3a429293fe035ff51d671a6f
parent	bc8d75bdf13cbfbd9ba7d39e0391fc11f22f1299 [diff]

Fix for "Android audio playout doesn't support non-call media stream"

BUG=webrtc:4767
R=magjed@webrtc.org

Review URL: https://codereview.webrtc.org/1419693004 .

Cr-Original-Commit-Position: refs/heads/master@{#10435}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 6408174cdc4040528dd87ff7e5c76be91cdbafbe

modules/audio_device/android/audio_manager.cc[diff]
modules/audio_device/android/audio_manager.h[diff]
modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java[diff]
modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java[diff]
modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java[diff]
modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java[diff]
modules/audio_device/android/opensles_player.cc[diff]
modules/audio_device/android/opensles_player.h[diff]

8 files changed