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

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

Merge "Clean up existing a11y listeners when reparenting." into rvc-dev am:... 

Merge "Clean up existing a11y listeners when reparenting." into rvc-dev am: 4d3059c0 am: 2e7a1c94 am: e6bee965

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

Change-Id: I7c55c5417254d6b46c531d96dc73db5bb3a98fda
parents a1321891 e6bee965

services/core/java/com/android/server/wm/DisplayContent.java

+3 −0
Original line number Diff line number Diff line
@@ -4776,6 +4776,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;