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

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

Merge "Don't call surface.remove if surface is null." into oc-mr1-dev

parents 36d3f3fd eafe737a

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

+6 −3
Original line number Diff line number Diff line
@@ -632,10 +632,13 @@ public class AppWindowContainerController 
                mContainer.startingSurface = null;

                mContainer.startingWindow = null;

                mContainer.startingDisplayed = false;

                if (surface == null && DEBUG_STARTING_WINDOW) {

                if (surface == null) {

                    if (DEBUG_STARTING_WINDOW) {

                        Slog.v(TAG_WM, "startingWindow was set but startingSurface==null, couldn't "

                                + "remove");

                    }

                    return;

                }

            } else {

                if (DEBUG_STARTING_WINDOW) {

                    Slog.v(TAG_WM, "Tried to remove starting window but startingWindow was null:"