Revert "Make TTS input string limit public and documented" (c3c427d2) · Commits · e / os / android_frameworks_base

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

+2 −10

Original line number	Original line	Diff line number	Diff line
	@@ -202,12 +202,6 @@ public class TextToSpeech {
	*/		*/
	public static final int USE_DEFAULTS = 0; // false		public static final int USE_DEFAULTS = 0; // false

	/**
	* Limit of length of input string passed to speak/synthesizeToFile.
	* Larger strings will be rejected.
	*/
	public static final int MAX_SPEECH_STRING_LENGTH = 4000;

	/**		/**
	* Package name of the default TTS engine.		* Package name of the default TTS engine.
	*		*
	@@ -807,8 +801,7 @@ public class TextToSpeech {
	* {@link #setOnUtteranceProgressListener}) and using the		* {@link #setOnUtteranceProgressListener}) and using the
	* {@link Engine#KEY_PARAM_UTTERANCE_ID} parameter.		* {@link Engine#KEY_PARAM_UTTERANCE_ID} parameter.
	*		*
	* @param text The string of text to be spoken. No longer than		* @param text The string of text to be spoken.
	* {@link Engine#MAX_SPEECH_STRING_LENGTH} characters.
	* @param queueMode The queuing strategy to use, {@link #QUEUE_ADD} or {@link #QUEUE_FLUSH}.		* @param queueMode The queuing strategy to use, {@link #QUEUE_ADD} or {@link #QUEUE_FLUSH}.
	* @param params Parameters for the request. Can be null.		* @param params Parameters for the request. Can be null.
	* Supported parameter names:		* Supported parameter names:
	@@ -1120,8 +1113,7 @@ public class TextToSpeech {
	* {@link #setOnUtteranceProgressListener}) and using the		* {@link #setOnUtteranceProgressListener}) and using the
	* {@link Engine#KEY_PARAM_UTTERANCE_ID} parameter.		* {@link Engine#KEY_PARAM_UTTERANCE_ID} parameter.
	*		*
	* @param text The text that should be synthesized. No longer than		* @param text The text that should be synthesized
	* {@link Engine#MAX_SPEECH_STRING_LENGTH} characters.
	* @param params Parameters for the request. Can be null.		* @param params Parameters for the request. Can be null.
	* Supported parameter names:		* Supported parameter names:
	* {@link Engine#KEY_PARAM_UTTERANCE_ID}.		* {@link Engine#KEY_PARAM_UTTERANCE_ID}.

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -74,7 +74,7 @@ public abstract class TextToSpeechService extends Service {
	private static final boolean DBG = false;		private static final boolean DBG = false;
	private static final String TAG = "TextToSpeechService";		private static final String TAG = "TextToSpeechService";

			private static final int MAX_SPEECH_ITEM_CHAR_LENGTH = 4000;
	private static final String SYNTH_THREAD_NAME = "SynthThread";		private static final String SYNTH_THREAD_NAME = "SynthThread";

	private SynthHandler mSynthHandler;		private SynthHandler mSynthHandler;
	@@ -552,7 +552,7 @@ public abstract class TextToSpeechService extends Service {
	Log.e(TAG, "null synthesis text");		Log.e(TAG, "null synthesis text");
	return false;		return false;
	}		}
	if (mText.length() >= TextToSpeech.Engine.MAX_SPEECH_STRING_LENGTH) {		if (mText.length() >= MAX_SPEECH_ITEM_CHAR_LENGTH) {
	Log.w(TAG, "Text too long: " + mText.length() + " chars");		Log.w(TAG, "Text too long: " + mText.length() + " chars");
	return false;		return false;
	}		}