Merge "Bug 3365937 notify TTS initialization listener of binding errors" into gingerbread
This commit is contained in:
committed by
Android (Google) Code Review
commit
a314f32ba9
@@ -464,10 +464,17 @@ public class TextToSpeech {
|
|||||||
|
|
||||||
Intent intent = new Intent("android.intent.action.START_TTS_SERVICE");
|
Intent intent = new Intent("android.intent.action.START_TTS_SERVICE");
|
||||||
intent.addCategory("android.intent.category.TTS");
|
intent.addCategory("android.intent.category.TTS");
|
||||||
mContext.bindService(intent, mServiceConnection,
|
boolean bound = mContext.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE);
|
||||||
Context.BIND_AUTO_CREATE);
|
if (!bound) {
|
||||||
// TODO handle case where the binding works (should always work) but
|
Log.e("TextToSpeech.java", "initTts() failed to bind to service");
|
||||||
// the plugin fails
|
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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -717,8 +724,9 @@ public class TextToSpeech {
|
|||||||
{
|
{
|
||||||
synchronized (mStartLock) {
|
synchronized (mStartLock) {
|
||||||
int result = ERROR;
|
int result = ERROR;
|
||||||
Log.i("TTS received: ", text);
|
Log.i("TextToSpeech.java - speak", "speak text of length " + text.length());
|
||||||
if (!mStarted) {
|
if (!mStarted) {
|
||||||
|
Log.e("TextToSpeech.java - speak", "service isn't started");
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
@@ -1226,7 +1234,10 @@ public class TextToSpeech {
|
|||||||
String filename) {
|
String filename) {
|
||||||
synchronized (mStartLock) {
|
synchronized (mStartLock) {
|
||||||
int result = ERROR;
|
int result = ERROR;
|
||||||
|
Log.i("TextToSpeech.java - synthesizeToFile", "synthesizeToFile text of length "
|
||||||
|
+ text.length());
|
||||||
if (!mStarted) {
|
if (!mStarted) {
|
||||||
|
Log.e("TextToSpeech.java - synthesizeToFile", "service isn't started");
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
|
|||||||
Reference in New Issue
Block a user