commit c27b072724962fe8275673a05add596be7f05214
author tiansiming <tiansiming@xiaomi.com> Fri Dec 15 22:41:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 15 22:41:34 2017 +0000
tree cff43902851812535743047b21ccb7e9789674f2
parent 5ef1f502f09ce534eb1d278e05b60dc012016441
parent 576e159641c1c0246ab154c5af9c834a9001f13b

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

Change-Id: I475b444fffea5a45532144bc85b7464979fa7a0d

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 9092c0d..9bb7958 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -770,7 +770,11 @@
         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");
+            }
         }
     }