Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a95fc29e authored by Alex Agranovich's avatar Alex Agranovich
Browse files

Fix TextToSpeech system connection error handling 

This CL fixes client listener notification upon engine binding error.
In addition fixes logs verbosity for errors caused by calls on dead client.

Bug: 183085464
Test: atest CtsSpeechTestCases
Change-Id: Ic67e97befd87f841430a53993ae5c79d81a0f6ba
parent 454771de

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

+2 −3
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }