generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensures that AudioManager.isVolumeFixed() is only used for Android L and above

Browse Source 
TBR=perkj
BUG=NONE
TEST=./webrtc/build/android/test_runner.py gtest -s modules_unittests --gtest_filter=AudioDevice* --num_retries=0

Review URL: https://webrtc-codereview.appspot.com/51499004

Cr-Commit-Position: refs/heads/master@{#8909}
This commit is contained in:
henrika 2015-04-01 12:00:00 +02:00
parent f536a507b6
commit 3cd9eaf5e8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java
View File

@ -228,10 +228,12 @@ class WebRtcAudioTrack {
private boolean SetStreamVolume(int volume) { private boolean SetStreamVolume(int volume) {
Logd("SetStreamVolume(" + volume + ")"); Logd("SetStreamVolume(" + volume + ")");
assertTrue(audioManager != null); assertTrue(audioManager != null);
if (WebRtcAudioUtils.runningOnLollipopOrHigher()) {
if (audioManager.isVolumeFixed()) { if (audioManager.isVolumeFixed()) {
Loge("The device implements a fixed volume policy."); Loge("The device implements a fixed volume policy.");
return false; return false;
} }
}
audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL, volume, 0); audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL, volume, 0);
return true; return true;
} }