Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Louis Chang
2021-08-19 05:56:42 +00:00
committed by Android (Google) Code Review
parent 90f055a04d 0ae8f3504b
commit c983f32c98
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/wm/WindowProcessController.java
View File

@@ -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.