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

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

@@ -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

@@ -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;
             }
         }