Merge "Fix TextToSpeech system connection error handling" into sc-dev

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

@@ -2427,9 +2427,8 @@ public class TextToSpeech {
                     @Override
                     public void onError(String errorInfo) {
                         Log.w(TAG, "System TTS connection error: " + errorInfo);
-                        // The connection was not established successfully - handle as
-                        // disconnection: clear the state and notify the user.
-                        onServiceDisconnected(/* componentName= */ null);
+                        // There is an error connecting to the engine - notify the listener.
+                        dispatchOnInit(ERROR);
                     }
                 });
 

services/texttospeech/java/com/android/server/texttospeech/TextToSpeechManagerPerUserService.java

@@ -174,7 +174,7 @@ final class TextToSpeechManagerPerUserService extends
         try {
             callbackRunnable.runOrThrow();
         } catch (RemoteException ex) {
-            Slog.w(TAG, "Failed running callback method", ex);
+            Slog.i(TAG, "Failed running callback method: " + ex);
         }
     }