Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-07-20 12:29:36 +02:00
commit b6e7a46e1b

View file

@ -279,7 +279,7 @@ public abstract class AbstractPrologCommandPlayer implements CommandPlayer, Stat
if (android.os.Build.VERSION.SDK_INT >= 8) { if (android.os.Build.VERSION.SDK_INT >= 8) {
mAudioFocusHelper = getAudioFocus(); mAudioFocusHelper = getAudioFocus();
} }
if (mAudioFocusHelper != null) { if (mAudioFocusHelper != null && ctx != null) {
mAudioFocusHelper.requestFocus(ctx, streamType); mAudioFocusHelper.requestFocus(ctx, streamType);
} }
// If AudioManager.STREAM_VOICE_CALL try using BT SCO: // If AudioManager.STREAM_VOICE_CALL try using BT SCO: