Merge "Fix NPE when press ttsEngines settings icon" am: 4b6e1b0758 am: 57b9039750

am: 576e159641 Change-Id: I475b444fffea5a45532144bc85b7464979fa7a0d
2017-12-15 22:41:34 +00:00
parent 5ef1f502f0 576e159641
commit c27b072724
1 changed files with 5 additions and 1 deletions
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -770,7 +770,11 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment
        if (KEY_TTS_ENGINE_PREFERENCE.equals(p.getKey())) {
            EngineInfo info = mEnginesHelper.getEngineInfo(mCurrentEngine);
            final Intent settingsIntent = mEnginesHelper.getSettingsIntent(info.name);
-            startActivity(settingsIntent);
+            if (settingsIntent != null) {
+                startActivity(settingsIntent);
+            } else {
+                Log.e(TAG, "settingsIntent is null");
+            }
        }
    }