Merge "Fix NPE when press ttsEngines settings icon"

2017-12-15 22:30:04 +00:00
parent b8bf3bbc72 b65c4c3e25
commit 4b6e1b0758
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
@@ -777,7 +777,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);
+            if (settingsIntent != null) {
                startActivity(settingsIntent);
+            } else {
+                Log.e(TAG, "settingsIntent is null");
+            }
        }
    }