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

Commit 61301e9c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix bad merge"

parents a7d15805 553cec66

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

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ public class AppWindowContainerController 
            if (DEBUG_STARTING_WINDOW) Slog.v(TAG_WM, "Remove starting " + mContainer

                    + ": startingWindow=" + mContainer.startingWindow

                    + " startingView=" + mContainer.startingSurface);

            if (mContainer == null) {

                return;

            }

            if (mContainer.startingWindow != null) {

                surface = mContainer.startingSurface;

                data = mContainer.startingData;