diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2010-07-26 17:56:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-26 17:56:20 -0700 |
| commit | 808616f9cc29634d3a2dc7a123618a2b9bfd40e9 (patch) | |
| tree | bc3c342ac4c9c0a42fc6b631e49f17016bda846d /core | |
| parent | 133dfe7e98d4eb6677c900fb3b17cd837ef7401b (diff) | |
| parent | fa95b474fc75849470546b0f18e58b2ca1ed2129 (diff) | |
| download | frameworks_base-808616f9cc29634d3a2dc7a123618a2b9bfd40e9.zip frameworks_base-808616f9cc29634d3a2dc7a123618a2b9bfd40e9.tar.gz frameworks_base-808616f9cc29634d3a2dc7a123618a2b9bfd40e9.tar.bz2 | |
am fa95b474: am 4a60d618: Fix NPE in TextToSpeech with setLanguage(null)
Merge commit 'fa95b474fc75849470546b0f18e58b2ca1ed2129'
* commit 'fa95b474fc75849470546b0f18e58b2ca1ed2129':
Fix NPE in TextToSpeech with setLanguage(null)
Diffstat (limited to 'core')
| -rwxr-xr-x | core/java/android/speech/tts/TextToSpeech.java | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ public class TextToSpeech { if (!mStarted) { return result; } + if (loc == null) { + return result; + } try { String language = loc.getISO3Language(); String country = loc.getISO3Country(); |