PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing TTS Settings crash on rotation caused by using deprecated API.

Browse Source 
Test: manual - rotated phone while playing TTS
Fix: 145579714

Change-Id: I7232704c92ba8ec34769cf68afe2278e22532d86
This commit is contained in:
Josh Imbriani
2020-01-29 15:33:07 -08:00
parent 8b15d86c5a
commit e77e22e208
2 changed files with 98 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/com/android/settings/tts/TextToSpeechSettings.java
View File

@@ -38,6 +38,7 @@ import android.util.Log;
import android.util.Pair;
import androidx.appcompat.app.AlertDialog;
import androidx.lifecycle.ViewModelProviders;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
@@ -205,13 +206,18 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment
mLocalePreference.setEnabled(entries.length > 0);
}
mTts = new TextToSpeech(getActivity().getApplicationContext(), mInitListener);
final TextToSpeechViewModel ttsViewModel =
ViewModelProviders.of(this).get(TextToSpeechViewModel.class);
Pair<TextToSpeech, Boolean> ttsAndNew = ttsViewModel.getTtsAndWhetherNew(mInitListener);
mTts = ttsAndNew.first;
// If the TTS object is not newly created, we need to run the setup on the settings side to
// ensure that we can use the TTS object.
if (!ttsAndNew.second) {
successSetup();
}
setTtsUtteranceProgressListener();
initSettings();
// Prevent restarting the TTS connection on rotation
setRetainInstance(true);
}
@Override
@@ -227,13 +233,21 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment
return;
}
if (!mTts.getDefaultEngine().equals(mTts.getCurrentEngine())) {
final TextToSpeechViewModel ttsViewModel =
ViewModelProviders.of(this).get(TextToSpeechViewModel.class);
try {
mTts.shutdown();
mTts = null;
// If the current engine isn't the default engine shut down the current engine in
// preparation for creating the new engine.
ttsViewModel.shutdownTts();
} catch (Exception e) {
Log.e(TAG, "Error shutting down TTS engine" + e);
}
mTts = new TextToSpeech(getActivity().getApplicationContext(), mInitListener);
final Pair<TextToSpeech, Boolean> ttsAndNew =
ttsViewModel.getTtsAndWhetherNew(mInitListener);
mTts = ttsAndNew.first;
if (!ttsAndNew.second) {
successSetup();
}
setTtsUtteranceProgressListener();
initSettings();
} else {
@@ -276,15 +290,6 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment
});
}
@Override
public void onDestroy() {
super.onDestroy();
if (mTts != null) {
mTts.shutdown();
mTts = null;
}
}
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
@@ -375,8 +380,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment
public void onInitEngine(int status) {
if (status == TextToSpeech.SUCCESS) {
if (DBG) Log.d(TAG, "TTS engine for settings screen initialized.");
checkDefaultLocale();
getActivity().runOnUiThread(() -> mLocalePreference.setEnabled(true));
successSetup();
} else {
if (DBG) {
Log.d(TAG,
@@ -386,6 +390,12 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment
}
}
/** Initialize TTS Settings on successful engine init. */
private void successSetup() {
checkDefaultLocale();
getActivity().runOnUiThread(() -> mLocalePreference.setEnabled(true));
}
private void checkDefaultLocale() {
Locale defaultLocale = mTts.getDefaultLanguage();
if (defaultLocale == null) {