commit d92af47f9369f50edac2d5c36f78aee4997bbe8d
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Tue Aug 13 06:43:09 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 13 06:43:09 2013 -0700
tree 00b05415c79315d82b40590e3a7b29175ea44ec3
parent 3b3a8b097225a5667e4ad69ac3fb9e6e1bf89f9c
parent 0e01f128ab8a8525a4d3fd72980e468f4de1e56c

am 0e01f128: Fix for TTS settings crash.

* commit '0e01f128ab8a8525a4d3fd72980e468f4de1e56c':
  Fix for TTS settings crash.

src/com/android/settings/tts/TextToSpeechSettings.java

diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index fa48a3f..c697661 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -140,6 +140,7 @@
 
         mPlayExample = findPreference(KEY_PLAY_EXAMPLE);
         mPlayExample.setOnPreferenceClickListener(this);
+        mPlayExample.setEnabled(false);
 
         mEnginePreferenceCategory = (PreferenceCategory) findPreference(
                 KEY_ENGINE_PREFERENCE_SECTION);
@@ -363,6 +364,9 @@
 
     private boolean isNetworkRequiredForSynthesis() {
         Set<String> features = mTts.getFeatures(mCurrentDefaultLocale);
+        if (features == null) {
+          return false;
+        }
         return features.contains(TextToSpeech.Engine.KEY_FEATURE_NETWORK_SYNTHESIS) &&
                 !features.contains(TextToSpeech.Engine.KEY_FEATURE_EMBEDDED_SYNTHESIS);
     }