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

Commit 553cec66 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Fix bad merge 

Test: Boot device, hope for the best
Change-Id: I0231874a5f4d7cc8b49cc6f978c17c1af6fa93be
Fixes: 34227241
parent e2c77f90

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;