commit 576e159641c1c0246ab154c5af9c834a9001f13b
author tiansiming <tiansiming@xiaomi.com> Fri Dec 15 22:38:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 15 22:38:29 2017 +0000
tree f1b8e500ae58a8bd85391ca4455043eb3585c414
parent e360d5147636bc9e331c1dd2a0e7b76e91eecd67
parent 57b9039750f1068001a252e6403fc5b6a8563f3b

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

Change-Id: Iae5884c2950e479c746e7b7761a40c250121dc16

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 e8823a6..c566967 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -777,7 +777,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");
+            }
         }
     }