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

Commit 5bee11f5 authored by Seigo Nonaka's avatar Seigo Nonaka Committed by android-build-merger
Browse files

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

am: 1b08a4a8

Change-Id: Ibee9f786daefba0d8a38c80e7727f1d6a8ebec88
parents db7d85c8 1b08a4a8

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:"