Merge "Prevent repeatedly resuming/pausing activities in split" into sc-v2-dev (c983f32c) · Commits · e / os / android_frameworks_base

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

+8 −5

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

		// Compare the z-order of ActivityStacks if both activities landed on same display.
		if (display == topDisplay
		&& mPreQTopResumedActivity.getRootTask().compareTo(
		activity.getRootTask()) <= 0) {
		// Update the topmost activity if the activity has higher z-order than the current
		// top-resumed activity.
		if (!canUpdate) {
		final ActivityRecord ar = topDisplay.getActivity(r -> r == activity,
		true /* traverseTopToBottom */, mPreQTopResumedActivity);
		if (ar != null && ar != mPreQTopResumedActivity) {
		canUpdate = true;
		}
		}

		if (canUpdate) {
		// Make sure the previous top activity in the process no longer be resumed.