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

Merge "Fix crash caused by failed TTS CheckVoiceData."

Browse Source
This commit is contained in:
Przemyslaw Szczepaniak
2014-02-24 11:45:13 +00:00
committed by Android (Google) Code Review
parent dba5623a0b 574fb952a1
commit 9c8b3d47d6
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/tts/TtsEngineSettingsFragment.java
View File

@@ -158,12 +158,22 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == VOICE_DATA_INTEGRITY_CHECK) { if (requestCode == VOICE_DATA_INTEGRITY_CHECK) {
mVoiceDataDetails = data; if (resultCode == TextToSpeech.Engine.CHECK_VOICE_DATA_PASS) {
updateVoiceDetails(); 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)); if (DBG) Log.d(TAG, "Parsing voice data details, data: " + mVoiceDataDetails.toUri(0));
final ArrayList<String> available = mVoiceDataDetails.getStringArrayListExtra( final ArrayList<String> available = mVoiceDataDetails.getStringArrayListExtra(