diff options
| author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2014-02-21 10:17:57 +0000 |
|---|---|---|
| committer | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2014-02-21 10:17:57 +0000 |
| commit | 574fb952a1e16dc409584abf36f6097c1167883a (patch) | |
| tree | 0fe0e5e7c262135e6ec1f1a378054f524a9902fa | |
| parent | 351adbf35c9d9674fbb98192425843e1ca58e8c1 (diff) | |
| download | packages_apps_Settings-574fb952a1e16dc409584abf36f6097c1167883a.zip packages_apps_Settings-574fb952a1e16dc409584abf36f6097c1167883a.tar.gz packages_apps_Settings-574fb952a1e16dc409584abf36f6097c1167883a.tar.bz2 | |
Fix crash caused by failed TTS CheckVoiceData.
Bug: 13112824
Change-Id: Idb46e499fc7982eb92b6ed1a88d7a0725896b4ef
| -rw-r--r-- | src/com/android/settings/tts/TtsEngineSettingsFragment.java | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java index bb5ac7a..25ec1fd 100644 --- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java +++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java @@ -158,12 +158,22 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == VOICE_DATA_INTEGRITY_CHECK) { - mVoiceDataDetails = data; - updateVoiceDetails(); + if (resultCode == TextToSpeech.Engine.CHECK_VOICE_DATA_PASS) { + updateVoiceDetails(data); + } else { + Log.e(TAG, "CheckVoiceData activity failed"); + } } } - private void updateVoiceDetails() { + private void updateVoiceDetails(Intent data) { + if (data == null){ + Log.e(TAG, "Engine failed voice data integrity check (null return)" + + mTts.getCurrentEngine()); + return; + } + mVoiceDataDetails = data; + if (DBG) Log.d(TAG, "Parsing voice data details, data: " + mVoiceDataDetails.toUri(0)); final ArrayList<String> available = mVoiceDataDetails.getStringArrayListExtra( |