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

Commit 5a21f2dd authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Clean-up starting window if resuming activity in another stack" into nyc-dev

parents b9db7490 2be760d4

services/core/java/com/android/server/am/ActivityStack.java

+1 −1
Original line number Diff line number Diff line
@@ -1902,7 +1902,7 @@ final class ActivityStack { 
            return false;

        }



        cancelInitializingActivities();

        mStackSupervisor.cancelInitializingActivities();



        // Find the first activity that is not finishing.

        final ActivityRecord next = topRunningActivityLocked();

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+9 −0
Original line number Diff line number Diff line
@@ -908,6 +908,15 @@ public final class ActivityStackSupervisor implements DisplayListener { 
        }

    }



    void cancelInitializingActivities() {

        for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {

            ArrayList<ActivityStack> stacks = mActivityDisplays.valueAt(displayNdx).mStacks;

            for (int stackNdx = stacks.size() - 1; stackNdx >= 0; --stackNdx) {

                stacks.get(stackNdx).cancelInitializingActivities();

            }

        }

    }



    void reportActivityVisibleLocked(ActivityRecord r) {

        sendWaitingVisibleReportLocked(r);

    }