Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa95b474 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android Git Automerger
Browse files

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

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

* commit '4a60d618':
  Fix NPE in TextToSpeech with setLanguage(null)
parents e80c30c6 4a60d618

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

+3 −0
Original line number Diff line number Diff line
@@ -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();