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

Merge "Deferring visibility updates while applying WCT" into sc-v2-dev am: b77dbe1e21

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

Change-Id: I3b2cb53f9cdd975d69a11ce77401301328f45868
This commit is contained in:
Louis Chang
2021-07-12 20:18:44 +00:00
committed by Automerger Merge Worker
parent 3771a729df b77dbe1e21
commit b8d732a4f5
4 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
View File

@@ -347,6 +347,12 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
*/
private int mVisibilityTransactionDepth;
/**
* Whether to the visibility updates that started from {@code RootWindowContainer} should be
* deferred.
*/
private boolean mDeferRootVisibilityUpdate;
private ActivityMetricsLogger mActivityMetricsLogger;
/** Check if placing task or activity on specified display is allowed. */
@@ -2263,6 +2269,14 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
return mVisibilityTransactionDepth > 0;
}
void setDeferRootVisibilityUpdate(boolean deferUpdate) {
mDeferRootVisibilityUpdate = deferUpdate;
}
boolean isRootVisibilityUpdateDeferred() {
return mDeferRootVisibilityUpdate;
}
/**
* Called when the state or visibility of an attached activity is changed.
*

3
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -1973,7 +1973,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
*/
void ensureActivitiesVisible(ActivityRecord starting, int configChanges,
boolean preserveWindows, boolean notifyClients) {
if (mTaskSupervisor.inActivityVisibilityUpdate()) {
if (mTaskSupervisor.inActivityVisibilityUpdate()
|| mTaskSupervisor.isRootVisibilityUpdateDeferred()) {
// Don't do recursive work.
return;
}

6
services/core/java/com/android/server/wm/Task.java
View File

@@ -4500,8 +4500,10 @@ class Task extends TaskFragment {
mAtmService.continueWindowLayout();
}
mRootWindowContainer.ensureActivitiesVisible(null, 0, PRESERVE_WINDOWS);
mRootWindowContainer.resumeFocusedTasksTopActivities();
if (!mTaskSupervisor.isRootVisibilityUpdateDeferred()) {
mRootWindowContainer.ensureActivitiesVisible(null, 0, PRESERVE_WINDOWS);
mRootWindowContainer.resumeFocusedTasksTopActivities();
}
}
void resumeNextFocusAfterReparent() {

3
services/core/java/com/android/server/wm/WindowOrganizerController.java
View File

@@ -275,6 +275,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
int effects = 0;
ProtoLog.v(WM_DEBUG_WINDOW_ORGANIZER, "Apply window transaction, syncId=%d", syncId);
mService.deferWindowLayout();
mService.mTaskSupervisor.setDeferRootVisibilityUpdate(true /* deferUpdate */);
try {
if (transition != null) {
// First check if we have a display rotation transition and if so, update it.
@@ -363,6 +364,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
task.setMainWindowSizeChangeTransaction(sft);
}
if ((effects & TRANSACT_EFFECTS_LIFECYCLE) != 0) {
mService.mTaskSupervisor.setDeferRootVisibilityUpdate(false /* deferUpdate */);
// Already calls ensureActivityConfig
mService.mRootWindowContainer.ensureActivitiesVisible(null, 0, PRESERVE_WINDOWS);
mService.mRootWindowContainer.resumeFocusedTasksTopActivities();
@@ -384,6 +386,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
mService.addWindowLayoutReasons(LAYOUT_REASON_CONFIG_CHANGED);
}
} finally {
mService.mTaskSupervisor.setDeferRootVisibilityUpdate(false /* deferUpdate */);
mService.continueWindowLayout();
}
}