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

Commit 1330ec33 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove StartingWindow or cancel the request to add StartingWindow after... 

Merge "Remove StartingWindow or cancel the request to add StartingWindow after all activities have been drawn" into main
parents 7a6864f3 ac54d3cc

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

+1 −1
Original line number Diff line number Diff line
@@ -6960,7 +6960,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        } else if (associatedTask.getActivity(

                r -> r.isVisibleRequested() && !r.firstWindowDrawn) == null) {

            // The last drawn activity may not be the one that owns the starting window.

            final ActivityRecord r = associatedTask.topActivityContainsStartingWindow();

            final ActivityRecord r = associatedTask.getActivity(ar -> ar.mStartingData != null);

            if (r != null) {

                r.removeStartingWindow();

            }