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

Commit 2463f6c5 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Updates the top-resumed activity if nothing to resume" into main

parents 6188fbde c64fd1ee

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

+3 −1
Original line number Diff line number Diff line
@@ -788,7 +788,9 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
                deferResume = false;

                // Already calls ensureActivityConfig

                mService.mRootWindowContainer.ensureActivitiesVisible();

                mService.mRootWindowContainer.resumeFocusedTasksTopActivities();

                if (!mService.mRootWindowContainer.resumeFocusedTasksTopActivities()) {

                    mService.mTaskSupervisor.updateTopResumedActivityIfNeeded("endWCT-effects");

                }

            } else if ((effects & TRANSACT_EFFECTS_CLIENT_CONFIG) != 0) {

                for (int i = haveConfigChanges.size() - 1; i >= 0; --i) {

                    haveConfigChanges.valueAt(i).forAllActivities(r -> {