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

Commit 3a6e246f authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Prevent repeatedly resuming/pausing activities in split" into sc-v2-dev am: c983f32c 

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

Change-Id: Ia7aca0c35715ba26eca3c4962a0bf02027193363
parents 7c688ba2 c983f32c

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

+8 −5
Original line number Original line Diff line number Diff line
@@ -730,12 +730,15 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 
            canUpdate = true;

            canUpdate = true;

        }

        }





        // Compare the z-order of ActivityStacks if both activities landed on same display.

        // Update the topmost activity if the activity has higher z-order than the current

        if (display == topDisplay

        // top-resumed activity.

                && mPreQTopResumedActivity.getRootTask().compareTo(

        if (!canUpdate) {

                        activity.getRootTask()) <= 0) {

            final ActivityRecord ar = topDisplay.getActivity(r -> r == activity,

                    true /* traverseTopToBottom */, mPreQTopResumedActivity);

            if (ar != null && ar != mPreQTopResumedActivity) {

                canUpdate = true;

                canUpdate = true;

            }

            }

        }





        if (canUpdate) {

        if (canUpdate) {

            // Make sure the previous top activity in the process no longer be resumed.

            // Make sure the previous top activity in the process no longer be resumed.