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

Commit c85b1a77 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix TextToSpeech system connection error handling" into sc-dev am: 5a6be5ac 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13918776

Change-Id: Iab9fa614d7b32919cbb9627a3925a029859475e9
parents 26dd362c 5a6be5ac

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);

        }

    }