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

Merge "Do not update visibility inside clearing task" into tm-qpr-dev

Browse Source
This commit is contained in:
Riddle Hsu
2022-07-19 14:39:12 +00:00
committed by Android (Google) Code Review
parent 0869abd848 494afca0bf
commit 7023f28bd0
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3528,7 +3528,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
}
final boolean isCurrentVisible = mVisibleRequested || isState(PAUSED, STARTED);
if (updateVisibility && isCurrentVisible) {
if (updateVisibility && isCurrentVisible
// Avoid intermediate lifecycle change when launching with clearing task.
&& !task.isClearingToReuseTask()) {
boolean ensureVisibility = false;
if (occludesParent(true /* includingFinishing */)) {
// If the current activity is not opaque, we need to make sure the visibilities of

14
services/tests/wmtests/src/com/android/server/wm/TaskTests.java
View File

@@ -268,6 +268,20 @@ public class TaskTests extends WindowTestsBase {
assertFalse(task.hasChild());
// In real case, the task should be preserved for adding new activity.
assertTrue(task.isAttached());
final ActivityRecord activityA = new ActivityBuilder(mAtm).setTask(task).build();
final ActivityRecord activityB = new ActivityBuilder(mAtm).setTask(task).build();
final ActivityRecord activityC = new ActivityBuilder(mAtm).setTask(task).build();
activityA.setState(ActivityRecord.State.STOPPED, "test");
activityB.setState(ActivityRecord.State.PAUSED, "test");
activityC.setState(ActivityRecord.State.RESUMED, "test");
doReturn(true).when(activityB).shouldBeVisibleUnchecked();
doReturn(true).when(activityC).shouldBeVisibleUnchecked();
activityA.getConfiguration().densityDpi += 100;
assertTrue(task.performClearTop(activityA, 0 /* launchFlags */).finishing);
// The bottom activity should destroy directly without relaunch for config change.
assertEquals(ActivityRecord.State.DESTROYING, activityA.getState());
verify(activityA, never()).startRelaunching();
}
@Test