am 4a60d618: Fix NPE in TextToSpeech with setLanguage(null)

Merge commit '4a60d61887a20d349e5eb38900dfbcaab06630fc' into gingerbread-plus-aosp

* commit '4a60d61887a20d349e5eb38900dfbcaab06630fc':
  Fix NPE in TextToSpeech with setLanguage(null)
This commit is contained in:
Jean-Michel Trivi
2010-07-26 17:53:57 -07:00
committed by Android Git Automerger

View File

@@ -1065,6 +1065,9 @@ public class TextToSpeech {
if (!mStarted) {
return result;
}
if (loc == null) {
return result;
}
try {
String language = loc.getISO3Language();
String country = loc.getISO3Country();