Merge "NPE occured when trying to parcel voice features." into mnc-dev (6bdc4637) · Commits · e / os / android_frameworks_base

core/java/android/speech/tts/TextToSpeechService.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ import java.io.FileOutputStream;
		import java.io.IOException;
		import java.util.ArrayList;
		import java.util.HashMap;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Locale;
		import java.util.MissingResourceException;
		@@ -247,7 +248,7 @@ public abstract class TextToSpeechService extends Service {
		* @return A list of features supported for the given language.
		*/
		protected Set<String> onGetFeaturesForLanguage(String lang, String country, String variant) {
		return null;
		return new HashSet<String>();
		}

		private int getExpectedLanguageAvailableStatus(Locale locale) {