Merge "Support plugin parameter updates for TTS plugin settings." (8419c2fa) · Commits · e / os / android_frameworks_base

packages/TtsService/src/android/tts/SynthProxy.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ public class SynthProxy {
		/**
		* Constructor; pass the location of the native TTS .so to use.
		*/
		public SynthProxy(String nativeSoLib) {
		public SynthProxy(String nativeSoLib, String engineConfig) {
		boolean applyFilter = nativeSoLib.toLowerCase().contains("pico");
		Log.v(TtsService.SERVICE_TAG, "About to load "+ nativeSoLib + ", applyFilter="+applyFilter);
		native_setup(new WeakReference<SynthProxy>(this), nativeSoLib);
		@@ -104,6 +104,13 @@ public class SynthProxy {
		return native_isLanguageAvailable(mJniData, language, country, variant);
		}

		/**
		* Sets the engine configuration.
		*/
		public int setConfig(String engineConfig) {
		return android.speech.tts.TextToSpeech.SUCCESS;
		}

		/**
		* Sets the language.
		*/

+2 −2

Original line number	Diff line number	Diff line
		@@ -166,7 +166,7 @@ public class TtsService extends Service implements OnCompletionListener {

		String soLibPath = "/system/lib/libttspico.so";
		if (sNativeSynth == null) {
		sNativeSynth = new SynthProxy(soLibPath);
		sNativeSynth = new SynthProxy(soLibPath, "");
		}

		mSelf = this;
		@@ -269,7 +269,7 @@ public class TtsService extends Service implements OnCompletionListener {
		sNativeSynth.shutdown();
		sNativeSynth = null;
		}
		sNativeSynth = new SynthProxy(soFilename);
		sNativeSynth = new SynthProxy(soFilename, "");
		currentSpeechEngineSOFile = soFilename;
		return TextToSpeech.SUCCESS;
		}