Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 3ebade5d to honeycomb-plus-aosp

Browse Source 
Change-Id: Ifd5f88f75feeb2dad1131e6a262dff3b979bdf8d
This commit is contained in:
Jean-Michel Trivi
2011-01-24 09:35:57 -08:00
parent f6a61c0abc 3ebade5d42
commit dc871fd870
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/java/android/speech/tts/TextToSpeech.java
View File

@@ -512,10 +512,17 @@ public class TextToSpeech {
Intent intent = new Intent("android.intent.action.START_TTS_SERVICE");
intent.addCategory("android.intent.category.TTS");
mContext.bindService(intent, mServiceConnection,
Context.BIND_AUTO_CREATE);
// TODO handle case where the binding works (should always work) but
// the plugin fails
boolean bound = mContext.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE);
if (!bound) {
Log.e("TextToSpeech.java", "initTts() failed to bind to service");
if (mInitListener != null) {
mInitListener.onInit(ERROR);
}
} else {
// initialization listener will be called inside ServiceConnection
Log.i("TextToSpeech.java", "initTts() successfully bound to service");
}
// TODO handle plugin failures
}
@@ -765,8 +772,9 @@ public class TextToSpeech {
{
synchronized (mStartLock) {
int result = ERROR;
Log.i("TTS", "speak() queueMode=" + queueMode);
Log.i("TextToSpeech.java - speak", "speak text of length " + text.length());
if (!mStarted) {
Log.e("TextToSpeech.java - speak", "service isn't started");
return result;
}
try {
@@ -1264,10 +1272,13 @@ public class TextToSpeech {
*/
public int synthesizeToFile(String text, HashMap<String,String> params,
String filename) {
Log.i("TTS", "synthesizeToFile()");
Log.i("TextToSpeech.java", "synthesizeToFile()");
synchronized (mStartLock) {
int result = ERROR;
Log.i("TextToSpeech.java - synthesizeToFile", "synthesizeToFile text of length "
+ text.length());
if (!mStarted) {
Log.e("TextToSpeech.java - synthesizeToFile", "service isn't started");
return result;
}
try {