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

Commit 02ec45ac authored by Aleksandar Kiridžić's avatar Aleksandar Kiridžić Committed by Android (Google) Code Review
Browse files

Merge "TTS: Fix binders leak due to a circular dependency"

parents 0d4e6be4 03c345ad

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

+1 −0
Original line number Diff line number Diff line
@@ -2422,6 +2422,7 @@ public class TextToSpeech { 
                    @Override

                    public void onDisconnected() {

                        onServiceDisconnected(/* componentName= */ null);

                        mSession = null;

                    }



                    @Override

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

+2 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ final class TextToSpeechManagerPerUserService extends 
            ServiceConnector.Impl<ITextToSpeechService> {



        private final String mEngine;

        private final ITextToSpeechSessionCallback mCallback;

        private ITextToSpeechSessionCallback mCallback;

        private final DeathRecipient mUnbindOnDeathHandler;



        static void start(Context context, @UserIdInt int userId, String engine,
@@ -156,6 +156,7 @@ final class TextToSpeechManagerPerUserService extends 
                } catch (NoSuchElementException ex) {

                    Slog.d(TAG, "The death recipient was not linked.");

                }

                mCallback = null;

            }

        }