forked from upstream-mirrors/OpenTracks
Bugfix: MediaPlayer creation might fail for ttsFallback.
Seen on a Fairphone 4. Part of #963.
This commit is contained in:
+13
-5
@@ -126,8 +126,12 @@ public class VoiceAnnouncement {
|
|||||||
}
|
}
|
||||||
if (ttsFallback == null) {
|
if (ttsFallback == null) {
|
||||||
ttsFallback = MediaPlayer.create(context, R.raw.tts_fallback);
|
ttsFallback = MediaPlayer.create(context, R.raw.tts_fallback);
|
||||||
ttsFallback.setAudioStreamType(AUDIO_STREAM);
|
if (ttsFallback == null) {
|
||||||
ttsFallback.setLooping(false);
|
Log.w(TAG, "MediaPlayer for ttsFallback could not be created.");
|
||||||
|
} else {
|
||||||
|
ttsFallback.setAudioStreamType(AUDIO_STREAM);
|
||||||
|
ttsFallback.setLooping(false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -148,9 +152,13 @@ public class VoiceAnnouncement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!ttsReady) {
|
if (!ttsReady) {
|
||||||
Log.i(TAG, "TTS not ready/available, just generating a tone.");
|
if (ttsFallback == null) {
|
||||||
ttsFallback.seekTo(0);
|
Log.w(TAG, "MediaPlayer for ttsFallback was not created.");
|
||||||
ttsFallback.start();
|
} else {
|
||||||
|
Log.i(TAG, "TTS not ready/available, just generating a tone.");
|
||||||
|
ttsFallback.seekTo(0);
|
||||||
|
ttsFallback.start();
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user