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

Merge "Revert "Reduce invocation of surface placement of switching activities"" into sc-dev

Browse Source
This commit is contained in:
Riddle Hsu
2021-05-27 02:09:15 +00:00
committed by Android (Google) Code Review
parent 75d63c116c fa96d4b6b4
commit 7f0bca6685
7 changed files with 8 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,7 +181,6 @@ import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLAS
import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_FREE_RESIZE;
import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_NONE;
import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_WINDOWING_MODE_RESIZE;
import static com.android.server.wm.ActivityTaskManagerService.SKIP_LAYOUT_REASON_ALLOWED;
import static com.android.server.wm.ActivityTaskManagerService.getInputDispatchingTimeoutMillisLocked;
import static com.android.server.wm.ActivityTaskSupervisor.PRESERVE_WINDOWS;
import static com.android.server.wm.IdentifierProto.HASH_CODE;
@@ -5359,11 +5358,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
mAtmService.deferWindowLayout();
try {
task.completePauseLocked(true /* resumeNext */, null /* resumingActivity */);
// If there is no possible transition to execute, then allow to skip layout
// because it may be done by next resumed activity.
if (!pausingActivity.mDisplayContent.areOpeningAppsReady()) {
mAtmService.addWindowLayoutReasons(SKIP_LAYOUT_REASON_ALLOWED);
}
} finally {
mAtmService.continueWindowLayout();
}

2
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -1549,8 +1549,6 @@ class ActivityStarter {
mService.getTransitionController().collect(r);
try {
mService.deferWindowLayout();
// Allow to skip layout because it may be done by the window of the starting activity.
mService.addWindowLayoutReasons(ActivityTaskManagerService.SKIP_LAYOUT_REASON_ALLOWED);
Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "startActivityInner");
result = startActivityInner(r, sourceRecord, voiceSession, voiceInteractor,
startFlags, doResume, options, inTask, restrictedBgActivity, intentGrants);

46
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -657,27 +657,14 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
@IntDef({
LAYOUT_REASON_CONFIG_CHANGED,
LAYOUT_REASON_VISIBILITY_CHANGED,
SKIP_LAYOUT_REASON_ALLOWED,
SKIP_LAYOUT_REASON_EXPECT_NEXT_RELAYOUT,
})
@interface LayoutReason {
}
static final int LAYOUT_REASON_MASK = 0x0000ffff;
static final int LAYOUT_REASON_CONFIG_CHANGED = 0x1;
static final int LAYOUT_REASON_VISIBILITY_CHANGED = 0x2;
static final int SKIP_LAYOUT_REASON_MASK = 0xfffe0000;
/**
* Allow to call {@link WindowSurfacePlacer#endDeferAndSkipLayout} if there is a reason
* included in {@link #SKIP_LAYOUT_REASON_MASK} was added.
*/
static final int SKIP_LAYOUT_REASON_ALLOWED = 1 << 16;
/** Used when the client is scheduled to call relayout. */
static final int SKIP_LAYOUT_REASON_EXPECT_NEXT_RELAYOUT = 1 << 17;
/** The reasons to perform or skip surface placement. */
/** The reasons to perform surface placement. */
@LayoutReason
private int mLayoutReasons;
@@ -4205,35 +4192,18 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
mWindowManager.mWindowPlacerLocked.deferLayout();
}
/**
* @see WindowSurfacePlacer#continueLayout
* @see WindowSurfacePlacer#endDeferAndSkipLayout
*/
/** @see WindowSurfacePlacer#continueLayout */
void continueWindowLayout() {
if ((mLayoutReasons & SKIP_LAYOUT_REASON_ALLOWED) != 0) {
final int skipReasons = mLayoutReasons & SKIP_LAYOUT_REASON_MASK;
if (skipReasons != 0) {
if (DEBUG_ALL) {
Slog.i(TAG, "continueWindowLayout skip-reasons="
+ Integer.toHexString(skipReasons));
}
mWindowManager.mWindowPlacerLocked.endDeferAndSkipLayout();
return;
}
}
final int reasons = mLayoutReasons & LAYOUT_REASON_MASK;
mWindowManager.mWindowPlacerLocked.continueLayout(reasons != 0);
if (DEBUG_ALL && reasons != 0 && !mWindowManager.mWindowPlacerLocked.isLayoutDeferred()) {
Slog.i(TAG, "continueWindowLayout reasons=" + Integer.toHexString(reasons));
mWindowManager.mWindowPlacerLocked.continueLayout(mLayoutReasons != 0);
if (DEBUG_ALL && !mWindowManager.mWindowPlacerLocked.isLayoutDeferred()) {
Slog.i(TAG, "continueWindowLayout reason=" + mLayoutReasons);
}
}
/**
* If a reason within {@link #LAYOUT_REASON_MASK} is added between {@link #deferWindowLayout}
* and {@link #continueWindowLayout}, {@link WindowSurfacePlacer#performSurfacePlacement} will
* be called when the last defer count is gone. Note that the {@link #SKIP_LAYOUT_REASON_MASK}
* has higher priority to determine whether to perform layout.
* If a reason is added between {@link #deferWindowLayout} and {@link #continueWindowLayout},
* it will make sure {@link WindowSurfacePlacer#performSurfacePlacement} is called when the last
* defer count is gone.
*/
void addWindowLayoutReasons(@LayoutReason int reasons) {
mLayoutReasons |= reasons;

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

@@ -938,9 +938,6 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
if (r.app != null) {
r.app.updateServiceConnectionActivities();
}
// Expect a window of the starting activity will perform relayout.
mService.addWindowLayoutReasons(
ActivityTaskManagerService.SKIP_LAYOUT_REASON_EXPECT_NEXT_RELAYOUT);
return true;
}

16
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -4035,22 +4035,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
return mLayoutNeeded;
}
/** Returns {@code true} if all opening apps may be ready to execute transition. */
boolean areOpeningAppsReady() {
final int size = mOpeningApps.size();
for (int i = size - 1; i >= 0; i--) {
final ActivityRecord r = mOpeningApps.valueAt(i);
if (!r.hasVisible) {
return false;
}
final WindowState w = r.findMainWindow();
if (w != null && !w.isDrawn()) {
return false;
}
}
return size > 0;
}
void dumpTokens(PrintWriter pw, boolean dumpAll) {
if (mTokenMap.isEmpty()) {
return;

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

@@ -106,7 +106,6 @@ import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_VISIB
import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM;
import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLASS_NAME;
import static com.android.server.wm.ActivityTaskManagerService.H.FIRST_ACTIVITY_TASK_MSG;
import static com.android.server.wm.ActivityTaskManagerService.SKIP_LAYOUT_REASON_EXPECT_NEXT_RELAYOUT;
import static com.android.server.wm.ActivityTaskSupervisor.DEFER_RESUME;
import static com.android.server.wm.ActivityTaskSupervisor.ON_TOP;
import static com.android.server.wm.ActivityTaskSupervisor.PRESERVE_WINDOWS;
@@ -6289,8 +6288,6 @@ class Task extends WindowContainer<WindowContainer> {
if (lastResumed != null) {
lastResumed.setWillCloseOrEnterPip(true);
}
// There may be a relayout from resuming next activity after the previous is paused.
mAtmService.addWindowLayoutReasons(SKIP_LAYOUT_REASON_EXPECT_NEXT_RELAYOUT);
return true;
} else if (mResumedActivity == next && next.isState(RESUMED)
&& taskDisplayArea.allResumedActivitiesComplete()) {
@@ -6500,7 +6497,6 @@ class Task extends WindowContainer<WindowContainer> {
ResumeActivityItem.obtain(next.app.getReportedProcState(),
dc.isNextTransitionForward()));
mAtmService.getLifecycleManager().scheduleTransaction(transaction);
mAtmService.addWindowLayoutReasons(SKIP_LAYOUT_REASON_EXPECT_NEXT_RELAYOUT);
ProtoLog.d(WM_DEBUG_STATES, "resumeTopActivityLocked: Resumed %s", next);
} catch (Exception e) {

10
services/core/java/com/android/server/wm/WindowSurfacePlacer.java
View File

@@ -101,16 +101,6 @@ class WindowSurfacePlacer {
}
}
/**
* Resumes layout passes but skip to perform layout even if there was a request. This can only
* be called when there will be another layout request from client side, e.g. an activity is
* starting or resuming. And there should be no other significant changes need to apply.
*/
void endDeferAndSkipLayout() {
mDeferDepth--;
mDeferredRequests = 0;
}
boolean isLayoutDeferred() {
return mDeferDepth > 0;
}