commit eacf0ecd00f77718ac4570077d729e33b6c320f4
author Brad Fitzpatrick <bradfitz@android.com> Mon Jul 26 19:44:50 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 26 19:44:50 2010 -0700
tree c6ebdd911d6de85d3c7577a5eeb35e154f7bc9f0
parent 4a60d61887a20d349e5eb38900dfbcaab06630fc
parent eb75888e6479317151c2ed44d47bd28ef567a4c7

Merge "Fix StrictMode for Binder.dump()" into gingerbread

core/java/android/speech/tts/TextToSpeech.java

diff --git a/core/java/android/speech/tts/TextToSpeech.java b/core/java/android/speech/tts/TextToSpeech.java
index 26c167e..841257f 100755
--- a/core/java/android/speech/tts/TextToSpeech.java
+++ b/core/java/android/speech/tts/TextToSpeech.java
@@ -1065,6 +1065,9 @@
             if (!mStarted) {
                 return result;
             }
+            if (loc == null) {
+                return result;
+            }
             try {
                 String language = loc.getISO3Language();
                 String country = loc.getISO3Country();