From 00959aee2c3a3e888b3f7b7dcda26dbb625e7f80 Mon Sep 17 00:00:00 2001
From: Garfield Tan <xutan@google.com>
Date: Tue, 2 Jun 2020 12:33:50 -0700
Subject: [PATCH] Clean up existing a11y listeners when reparenting.

This would clean up listeners if display has been reparented more than
once.

Bug: 157605189
Test: Bubbles show up.
Test: atest DisplayContentTests
Change-Id: Ic616015ff516e4c054fdaab5cc0d82e8d82c8dfc
---
 services/core/java/com/android/server/wm/DisplayContent.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 8903776469db9..b476d93a8eaa1 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -4772,6 +4772,9 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
      * @param sc The new SurfaceControl, where the DisplayContent's surfaces will be re-parented to.
      */
     void reparentDisplayContent(WindowState win, SurfaceControl sc) {
+        if (mParentWindow != null) {
+            mParentWindow.removeEmbeddedDisplayContent(this);
+        }
         mParentWindow = win;
         mParentWindow.addEmbeddedDisplayContent(this);
         mParentSurfaceControl = sc;