commit dac3063adb10f547d4392fe5bf08a10d3b08486d
author Jeff Hamilton <jham@android.com> Thu Jan 27 23:39:31 2011 -0600
committer Ed Heyl <ed@google.com> Fri Jan 28 13:16:46 2011 -0800
tree 669a50fac581c2f93f95ccfd28ff8b31820d23e9
parent d1fda43ed7343b4775a65e80629d85b7e99b14eb

resolved conflicts for merge of a314f32b to honeycomb-merge

Change-Id: I98d37ee8666d9d3f195d2b23d50dc851f1ef6500

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

diff --git a/core/java/android/speech/tts/TextToSpeech.java b/core/java/android/speech/tts/TextToSpeech.java
index c46d2c5..6d7b7ce 100755
--- a/core/java/android/speech/tts/TextToSpeech.java
+++ b/core/java/android/speech/tts/TextToSpeech.java
@@ -512,10 +512,17 @@
 
         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 @@
     {
         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 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 {