Merge branch 'master' of git.linphone.org:linphone-android into dev_phonenumber

This commit is contained in:
Margaux Clerc 2016-08-11 16:30:52 +02:00
commit 1c1f97e156
2 changed files with 6 additions and 4 deletions

View file

@ -1188,10 +1188,12 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
Log.i("Set audio mode on 'Voice Communication'");
int oldVolume = mAudioManager.getStreamVolume(STREAM_VOICE_CALL);
int maxVolume = mAudioManager.getStreamMaxVolume(STREAM_VOICE_CALL);
int sampleRate = 0;
int sampleRate = 44100;
mAudioManager.setStreamVolume(STREAM_VOICE_CALL, maxVolume, 0);
String sampleRateProperty = mAudioManager.getProperty(AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE);
sampleRate = Integer.parseInt(sampleRateProperty);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
String sampleRateProperty = mAudioManager.getProperty(AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE);
sampleRate = Integer.parseInt(sampleRateProperty);
}
int status = mLc.startEchoTester(sampleRate);
if (status > 0)
echoTesterIsRunning = true;

@ -1 +1 @@
Subproject commit 8d21acd7f07fa40604dda8cf44fb114b5f637565
Subproject commit 4c2268e2de1cf3fd503e3682e2e2ad77bbebc950