Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-07-03 16:39:02 +02:00
commit 4c3af1d6f4

View file

@ -334,7 +334,6 @@ public abstract class AbstractPrologCommandPlayer implements CommandPlayer, Stat
}
private boolean stopBtSco(Context context) {
btScoStatus = false;
AudioManager mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
if (mAudioManager == null) {
return false;
@ -342,6 +341,7 @@ public abstract class AbstractPrologCommandPlayer implements CommandPlayer, Stat
mAudioManager.setBluetoothScoOn(false);
mAudioManager.stopBluetoothSco();
mAudioManager.setMode(AudioManager.MODE_NORMAL);
btScoStatus = false;
return true;
}