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

Commit e10e2e3b authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Add some more logging for tracking null home overlay surfaces" into main

parents fe63566d 65607838

libs/WindowManager/Shell/src/com/android/wm/shell/sysui/ShellController.java

+4 −1
Original line number Diff line number Diff line
@@ -262,7 +262,10 @@ public class ShellController { 
    public void createExternalInterfaces(Bundle output) {

        // Invalidate the old binders

        for (int i = 0; i < mExternalInterfaces.size(); i++) {

            mExternalInterfaces.valueAt(i).invalidate();

            final ExternalInterfaceBinder extInterface = mExternalInterfaces.valueAt(i);

            ProtoLog.v(WM_SHELL_SYSUI_EVENTS, "Invalidating external interface: %s",

                    extInterface.getClass().getSimpleName());

            extInterface.invalidate();

        }

        mExternalInterfaces.clear();

libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java

+4 −0
Original line number Diff line number Diff line
@@ -1761,6 +1761,10 @@ public class Transitions implements RemoteCallable<Transitions>, 
                    (controller) -> {

                        result[0] = controller.getHomeTaskOverlayContainer();

                    }, true /* blocking */);

            if (result[0] == null) {

                Log.wtf("WindowManagerShell", "Null home task overlay surface, "

                        + "mTransitions=%s" + (mTransitions != null));

            }

            // Return a copy as writing to parcel releases the original surface

            return new SurfaceControl(result[0], "Transitions.HomeOverlay");

        }