Merge "Remove refernces to V1 API, as V2 doesn't exist anymore." (9b011937) · Commits · e / os / android_frameworks_base

core/java/android/speech/tts/EventLoggerV1.java→core/java/android/speech/tts/EventLogger.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -18,14 +18,14 @@ package android.speech.tts;
		import android.text.TextUtils;

		/**
		* Writes data about a given speech synthesis request for V1 API to the event
		* logs. The data that is logged includes the calling app, length of the
		* utterance, speech rate / pitch, the latency, and overall time taken.
		* Writes data about a given speech synthesis request to the event logs. The data that is logged
		* includes the calling app, length of the utterance, speech rate / pitch, the latency, and overall
		* time taken.
		*/
		class EventLoggerV1 extends AbstractEventLogger {
		class EventLogger extends AbstractEventLogger {
		private final SynthesisRequest mRequest;

		EventLoggerV1(SynthesisRequest request, int callerUid, int callerPid, String serviceApp) {
		EventLogger(SynthesisRequest request, int callerUid, int callerPid, String serviceApp) {
		super(callerUid, callerPid, serviceApp);
		mRequest = request;
		}

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

+260 −197

Original line number	Diff line number	Diff line
		@@ -226,17 +226,14 @@ public abstract class TextToSpeechService extends Service {
		protected abstract void onStop();

		/**
		* Tells the service to synthesize speech from the given text. This method
		* should block until the synthesis is finished. Used for requests from V1
		* clients ({@link android.speech.tts.TextToSpeech}). Called on the synthesis
		* thread.
		* Tells the service to synthesize speech from the given text. This method should block until
		* the synthesis is finished. Called on the synthesis thread.
		*
		* @param request The synthesis request.
		* @param callback The callback that the engine must use to make data
		* available for playback or for writing to a file.
		* @param callback The callback that the engine must use to make data available for playback or
		* for writing to a file.
		*/
		protected abstract void onSynthesizeText(SynthesisRequest request,
		SynthesisCallback callback);
		protected abstract void onSynthesizeText(SynthesisRequest request, SynthesisCallback callback);

		/**
		* Queries the service for a set of features supported for a given language.
		@@ -713,8 +710,7 @@ public abstract class TextToSpeechService extends Service {
		}

		/** Create AudioOutputParams from A {@link SynthesisRequest#getParams()} bundle */
		static AudioOutputParams createFromV1ParamsBundle(Bundle paramsBundle,
		boolean isSpeech) {
		static AudioOutputParams createFromParamsBundle(Bundle paramsBundle, boolean isSpeech) {
		if (paramsBundle == null) {
		return new AudioOutputParams();
		}
		@@ -902,16 +898,19 @@ public abstract class TextToSpeechService extends Service {
		}

		/**
		* UtteranceSpeechItem for V1 API speech items. V1 API speech items keep
		* synthesis parameters in a single Bundle passed as parameter. This class
		* allow subclasses to access them conveniently.
		* Synthesis parameters are kept in a single Bundle passed as parameter. This class allow
		* subclasses to access them conveniently.
		*/
		private abstract class SpeechItemV1 extends UtteranceSpeechItem {
		private abstract class UtteranceSpeechItemWithParams extends UtteranceSpeechItem {
		protected final Bundle mParams;
		protected final String mUtteranceId;

		SpeechItemV1(Object callerIdentity, int callerUid, int callerPid,
		Bundle params, String utteranceId) {
		UtteranceSpeechItemWithParams(
		Object callerIdentity,
		int callerUid,
		int callerPid,
		Bundle params,
		String utteranceId) {
		super(callerIdentity, callerUid, callerPid);
		mParams = params;
		mUtteranceId = utteranceId;
		@@ -935,11 +934,11 @@ public abstract class TextToSpeechService extends Service {
		}

		AudioOutputParams getAudioParams() {
		return AudioOutputParams.createFromV1ParamsBundle(mParams, true);
		return AudioOutputParams.createFromParamsBundle(mParams, true);
		}
		}

		class SynthesisSpeechItemV1 extends SpeechItemV1 {
		class SynthesisSpeechItem extends UtteranceSpeechItemWithParams {
		// Never null.
		private final CharSequence mText;
		private final SynthesisRequest mSynthesisRequest;
		@@ -947,19 +946,23 @@ public abstract class TextToSpeechService extends Service {
		// Non null after synthesis has started, and all accesses
		// guarded by 'this'.
		private AbstractSynthesisCallback mSynthesisCallback;
		private final EventLoggerV1 mEventLogger;
		private final EventLogger mEventLogger;
		private final int mCallerUid;

		public SynthesisSpeechItemV1(Object callerIdentity, int callerUid, int callerPid,
		Bundle params, String utteranceId, CharSequence text) {
		public SynthesisSpeechItem(
		Object callerIdentity,
		int callerUid,
		int callerPid,
		Bundle params,
		String utteranceId,
		CharSequence text) {
		super(callerIdentity, callerUid, callerPid, params, utteranceId);
		mText = text;
		mCallerUid = callerUid;
		mSynthesisRequest = new SynthesisRequest(mText, mParams);
		mDefaultLocale = getSettingsLocale();
		setRequestParams(mSynthesisRequest);
		mEventLogger = new EventLoggerV1(mSynthesisRequest, callerUid, callerPid,
		mPackageName);
		mEventLogger = new EventLogger(mSynthesisRequest, callerUid, callerPid, mPackageName);
		}

		public CharSequence getText() {
		@@ -1053,11 +1056,16 @@ public abstract class TextToSpeechService extends Service {
		}
		}

		private class SynthesisToFileOutputStreamSpeechItemV1 extends SynthesisSpeechItemV1 {
		private class SynthesisToFileOutputStreamSpeechItem extends SynthesisSpeechItem {
		private final FileOutputStream mFileOutputStream;

		public SynthesisToFileOutputStreamSpeechItemV1(Object callerIdentity, int callerUid,
		int callerPid, Bundle params, String utteranceId, CharSequence text,
		public SynthesisToFileOutputStreamSpeechItem(
		Object callerIdentity,
		int callerUid,
		int callerPid,
		Bundle params,
		String utteranceId,
		CharSequence text,
		FileOutputStream fileOutputStream) {
		super(callerIdentity, callerUid, callerPid, params, utteranceId, text);
		mFileOutputStream = fileOutputStream;
		@@ -1080,11 +1088,16 @@ public abstract class TextToSpeechService extends Service {
		}
		}

		private class AudioSpeechItemV1 extends SpeechItemV1 {
		private class AudioSpeechItem extends UtteranceSpeechItemWithParams {
		private final AudioPlaybackQueueItem mItem;

		public AudioSpeechItemV1(Object callerIdentity, int callerUid, int callerPid,
		Bundle params, String utteranceId, Uri uri) {
		public AudioSpeechItem(
		Object callerIdentity,
		int callerUid,
		int callerPid,
		Bundle params,
		String utteranceId,
		Uri uri) {
		super(callerIdentity, callerUid, callerPid, params, utteranceId);
		mItem = new AudioPlaybackQueueItem(this, getCallerIdentity(),
		TextToSpeechService.this, uri, getAudioParams());
		@@ -1112,7 +1125,7 @@ public abstract class TextToSpeechService extends Service {

		@Override
		AudioOutputParams getAudioParams() {
		return AudioOutputParams.createFromV1ParamsBundle(mParams, false);
		return AudioOutputParams.createFromParamsBundle(mParams, false);
		}
		}

		@@ -1219,27 +1232,42 @@ public abstract class TextToSpeechService extends Service {
		}

		/**
		* Binder returned from {@code #onBind(Intent)}. The methods in this class can be
		* called called from several different threads.
		* Binder returned from {@code #onBind(Intent)}. The methods in this class can be called called
		* from several different threads.
		*/
		// NOTE: All calls that are passed in a calling app are interned so that
		// they can be used as message objects (which are tested for equality using ==).
		private final ITextToSpeechService.Stub mBinder = new ITextToSpeechService.Stub() {
		private final ITextToSpeechService.Stub mBinder =
		new ITextToSpeechService.Stub() {
		@Override
		public int speak(IBinder caller, CharSequence text, int queueMode, Bundle params,
		public int speak(
		IBinder caller,
		CharSequence text,
		int queueMode,
		Bundle params,
		String utteranceId) {
		if (!checkNonNull(caller, text, params)) {
		return TextToSpeech.ERROR;
		}

		SpeechItem item = new SynthesisSpeechItemV1(caller,
		Binder.getCallingUid(), Binder.getCallingPid(), params, utteranceId, text);
		SpeechItem item =
		new SynthesisSpeechItem(
		caller,
		Binder.getCallingUid(),
		Binder.getCallingPid(),
		params,
		utteranceId,
		text);
		return mSynthHandler.enqueueSpeechItem(queueMode, item);
		}

		@Override
		public int synthesizeToFileDescriptor(IBinder caller, CharSequence text, ParcelFileDescriptor
		fileDescriptor, Bundle params, String utteranceId) {
		public int synthesizeToFileDescriptor(
		IBinder caller,
		CharSequence text,
		ParcelFileDescriptor fileDescriptor,
		Bundle params,
		String utteranceId) {
		if (!checkNonNull(caller, text, fileDescriptor, params)) {
		return TextToSpeech.ERROR;
		}
		@@ -1247,35 +1275,58 @@ public abstract class TextToSpeechService extends Service {
		// In test env, ParcelFileDescriptor instance may be EXACTLY the same
		// one that is used by client. And it will be closed by a client, thus
		// preventing us from writing anything to it.
		final ParcelFileDescriptor sameFileDescriptor = ParcelFileDescriptor.adoptFd(
		fileDescriptor.detachFd());

		SpeechItem item = new SynthesisToFileOutputStreamSpeechItemV1(caller,
		Binder.getCallingUid(), Binder.getCallingPid(), params, utteranceId, text,
		new ParcelFileDescriptor.AutoCloseOutputStream(sameFileDescriptor));
		final ParcelFileDescriptor sameFileDescriptor =
		ParcelFileDescriptor.adoptFd(fileDescriptor.detachFd());

		SpeechItem item =
		new SynthesisToFileOutputStreamSpeechItem(
		caller,
		Binder.getCallingUid(),
		Binder.getCallingPid(),
		params,
		utteranceId,
		text,
		new ParcelFileDescriptor.AutoCloseOutputStream(
		sameFileDescriptor));
		return mSynthHandler.enqueueSpeechItem(TextToSpeech.QUEUE_ADD, item);
		}

		@Override
		public int playAudio(IBinder caller, Uri audioUri, int queueMode, Bundle params,
		public int playAudio(
		IBinder caller,
		Uri audioUri,
		int queueMode,
		Bundle params,
		String utteranceId) {
		if (!checkNonNull(caller, audioUri, params)) {
		return TextToSpeech.ERROR;
		}

		SpeechItem item = new AudioSpeechItemV1(caller,
		Binder.getCallingUid(), Binder.getCallingPid(), params, utteranceId, audioUri);
		SpeechItem item =
		new AudioSpeechItem(
		caller,
		Binder.getCallingUid(),
		Binder.getCallingPid(),
		params,
		utteranceId,
		audioUri);
		return mSynthHandler.enqueueSpeechItem(queueMode, item);
		}

		@Override
		public int playSilence(IBinder caller, long duration, int queueMode, String utteranceId) {
		public int playSilence(
		IBinder caller, long duration, int queueMode, String utteranceId) {
		if (!checkNonNull(caller)) {
		return TextToSpeech.ERROR;
		}

		SpeechItem item = new SilenceSpeechItem(caller,
		Binder.getCallingUid(), Binder.getCallingPid(), utteranceId, duration);
		SpeechItem item =
		new SilenceSpeechItem(
		caller,
		Binder.getCallingUid(),
		Binder.getCallingPid(),
		utteranceId,
		duration);
		return mSynthHandler.enqueueSpeechItem(queueMode, item);
		}

		@@ -1317,7 +1368,8 @@ public abstract class TextToSpeechService extends Service {
		}

		@Override
		public String[] getFeaturesForLanguage(String lang, String country, String variant) {
		public String[] getFeaturesForLanguage(
		String lang, String country, String variant) {
		Set<String> features = onGetFeaturesForLanguage(lang, country, variant);
		String[] featuresArray = null;
		if (features != null) {
		@@ -1334,21 +1386,28 @@ public abstract class TextToSpeechService extends Service {
		* are enforced.
		*/
		@Override
		public int loadLanguage(IBinder caller, String lang, String country, String variant) {
		public int loadLanguage(
		IBinder caller, String lang, String country, String variant) {
		if (!checkNonNull(lang)) {
		return TextToSpeech.ERROR;
		}
		int retVal = onIsLanguageAvailable(lang, country, variant);

		if (retVal == TextToSpeech.LANG_AVAILABLE \|\|
		retVal == TextToSpeech.LANG_COUNTRY_AVAILABLE \|\|
		retVal == TextToSpeech.LANG_COUNTRY_VAR_AVAILABLE) {

		SpeechItem item = new LoadLanguageItem(caller, Binder.getCallingUid(),
		Binder.getCallingPid(), lang, country, variant);

		if (mSynthHandler.enqueueSpeechItem(TextToSpeech.QUEUE_ADD, item) !=
		TextToSpeech.SUCCESS) {
		if (retVal == TextToSpeech.LANG_AVAILABLE
		\|\| retVal == TextToSpeech.LANG_COUNTRY_AVAILABLE
		\|\| retVal == TextToSpeech.LANG_COUNTRY_VAR_AVAILABLE) {

		SpeechItem item =
		new LoadLanguageItem(
		caller,
		Binder.getCallingUid(),
		Binder.getCallingPid(),
		lang,
		country,
		variant);

		if (mSynthHandler.enqueueSpeechItem(TextToSpeech.QUEUE_ADD, item)
		!= TextToSpeech.SUCCESS) {
		return TextToSpeech.ERROR;
		}
		}
		@@ -1368,10 +1427,14 @@ public abstract class TextToSpeechService extends Service {
		int retVal = onIsValidVoiceName(voiceName);

		if (retVal == TextToSpeech.SUCCESS) {
		SpeechItem item = new LoadVoiceItem(caller, Binder.getCallingUid(),
		Binder.getCallingPid(), voiceName);
		if (mSynthHandler.enqueueSpeechItem(TextToSpeech.QUEUE_ADD, item) !=
		TextToSpeech.SUCCESS) {
		SpeechItem item =
		new LoadVoiceItem(
		caller,
		Binder.getCallingUid(),
		Binder.getCallingPid(),
		voiceName);
		if (mSynthHandler.enqueueSpeechItem(TextToSpeech.QUEUE_ADD, item)
		!= TextToSpeech.SUCCESS) {
		return TextToSpeech.ERROR;
		}
		}
		@@ -1384,9 +1447,9 @@ public abstract class TextToSpeechService extends Service {
		}
		int retVal = onIsLanguageAvailable(lang, country, variant);

		if (retVal == TextToSpeech.LANG_AVAILABLE \|\|
		retVal == TextToSpeech.LANG_COUNTRY_AVAILABLE \|\|
		retVal == TextToSpeech.LANG_COUNTRY_VAR_AVAILABLE) {
		if (retVal == TextToSpeech.LANG_AVAILABLE
		\|\| retVal == TextToSpeech.LANG_COUNTRY_AVAILABLE
		\|\| retVal == TextToSpeech.LANG_COUNTRY_VAR_AVAILABLE) {
		return onGetDefaultVoiceNameFor(lang, country, variant);
		} else {
		return null;

core/java/android/speech/tts/TtsEngines.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -471,9 +471,7 @@ public class TtsEngines {
		String[] ret = new String[]{"","",""};
		try {
		// Note that the default locale might have an empty variant
		// or language, and we take care that the construction is
		// the same as {@link #getV1Locale} i.e no trailing delimiters
		// or spaces.
		// or language.
		ret[0] = locale.getISO3Language();
		ret[1] = locale.getISO3Country();
		ret[2] = locale.getVariant();