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

Commit 2f65063b authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Dispatch organized tasks info chagne when committing visibility" into... 

Merge "Dispatch organized tasks info chagne when committing visibility" into sc-v2-dev am: 05b2d626 am: 81504bcc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15926312

Change-Id: Ie403cbb164b52cb06d18df059f3492311ae6487c
parents eefcf058 81504bcc

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

+4 −5
Original line number Diff line number Diff line
@@ -4946,11 +4946,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        // dispatchTaskInfoChangedIfNeeded() right after ActivityRecord#setVisibility() can report

        // the stale visible state, because the state will be updated after the app transition.

        // So tries to report the actual visible state again where the state is changed.

        if (!mTaskSupervisor.inActivityVisibilityUpdate()) {

            final Task task = getOrganizedTask();

            if (task != null) {

        Task task = getOrganizedTask();

        while (task != null) {

            task.dispatchTaskInfoChangedIfNeeded(false /* force */);

            }

            task = task.getParent().asTask();

        }

        ProtoLog.v(WM_DEBUG_APP_TRANSITIONS,

                "commitVisibility: %s: visible=%b mVisibleRequested=%b", this,

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

+0 −4
Original line number Diff line number Diff line
@@ -4809,10 +4809,6 @@ class Task extends TaskFragment { 
                        notifyClients);

            }, true /* traverseTopToBottom */);



            // Notify WM shell that task visibilities may have changed

            forAllTasks(task -> task.dispatchTaskInfoChangedIfNeeded(/* force */ false),

                    true /* traverseTopToBottom */);



            if (mTranslucentActivityWaiting != null &&

                    mUndrawnActivitiesBelowTopTranslucent.isEmpty()) {

                // Nothing is getting drawn or everything was already visible, don't wait for