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

Merge "Hide unnecessary test method" into udc-dev

Browse Source
This commit is contained in:
Riddle Hsu
2023-03-06 07:34:38 +00:00
committed by Android (Google) Code Review
parent fa6c4fde3c 3c644ec834
commit 99ca3140b7
7 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5228,8 +5228,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
mTaskSupervisor.mAppVisibilitiesChangedSinceLastPause = true;
}
@VisibleForTesting
void setVisibility(boolean visible, boolean deferHidingClient) {
private void setVisibility(boolean visible, boolean deferHidingClient) {
final AppTransition appTransition = getDisplayContent().mAppTransition;
// Don't set visibility to false if we were already not visible. This prevents WM from

2
services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
View File

@@ -2897,7 +2897,7 @@ public class ActivityRecordTests extends WindowTestsBase {
// Make the top one invisible, and try transferring the starting window from the top to the
// bottom one.
activityTop.setVisibility(false, false);
activityTop.setVisibility(false);
activityBottom.transferStartingWindowFromHiddenAboveTokenIfNeeded();
waitUntilHandlersIdle();

2
services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java
View File

@@ -165,7 +165,7 @@ public class AppChangeTransitionTests extends WindowTestsBase {
assertTrue(mTask.isInChangeTransition());
// Changing visibility should cancel the change transition and become closing
mActivity.setVisibility(false, false);
mActivity.setVisibility(false);
assertEquals(0, mDisplayContent.mChangingContainers.size());
assertFalse(mTask.isInChangeTransition());

6
services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java
View File

@@ -295,8 +295,8 @@ public class AppTransitionTests extends WindowTestsBase {
dc2.prepareAppTransition(TRANSIT_CLOSE);
// One activity window is visible for resuming & the other activity window is invisible
// for finishing in different display.
activity1.setVisibility(true, false);
activity2.setVisibility(false, false);
activity1.setVisibility(true);
activity2.setVisibility(false);
// Make sure each display is in animating stage.
assertTrue(dc1.mOpeningApps.size() > 0);
@@ -365,7 +365,7 @@ public class AppTransitionTests extends WindowTestsBase {
dc.prepareAppTransition(TRANSIT_CLOSE);
assertTrue(dc.mAppTransition.containsTransitRequest(TRANSIT_CLOSE));
dc.mAppTransition.overridePendingAppTransitionRemote(adapter);
exitingActivity.setVisibility(false, false);
exitingActivity.setVisibility(false);
assertTrue(dc.mClosingApps.size() > 0);
// Make sure window is in animating stage before freeze, and cancel after freeze.

4
services/tests/wmtests/src/com/android/server/wm/TaskFragmentTest.java
View File

@@ -351,8 +351,8 @@ public class TaskFragmentTest extends WindowTestsBase {
final TaskFragment taskFragment1 = createTaskFragmentWithEmbeddedActivity(task, mOrganizer);
final ActivityRecord activity0 = taskFragment0.getTopMostActivity();
final ActivityRecord activity1 = taskFragment1.getTopMostActivity();
activity0.setVisibility(true /* visible */, false /* deferHidingClient */);
activity1.setVisibility(true /* visible */, false /* deferHidingClient */);
activity0.setVisibility(true);
activity1.setVisibility(true);
spyOn(mAtm.mTaskFragmentOrganizerController);
// Move activity to pinned.

4
services/tests/wmtests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java
View File

@@ -92,11 +92,11 @@ public class UnknownAppVisibilityControllerTest extends WindowTestsBase {
@Test
public void testRemoveFinishingInvisibleActivityFromUnknown() {
final ActivityRecord activity = createNonAttachedActivityRecord(mDisplayContent);
final ActivityRecord activity = new ActivityBuilder(mAtm).setCreateTask(true).build();
mDisplayContent.mUnknownAppVisibilityController.notifyLaunched(activity);
activity.finishing = true;
activity.setVisibleRequested(true);
activity.setVisibility(false, false);
activity.setVisibility(false);
assertTrue(mDisplayContent.mUnknownAppVisibilityController.allResolved());
}

10
services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
View File

@@ -914,15 +914,15 @@ public class WindowStateTests extends WindowTestsBase {
final WindowState app = createWindow(null, TYPE_APPLICATION, "app", uid);
app.mActivityRecord.setVisible(false);
app.mActivityRecord.setVisibility(false /* visible */, false /* deferHidingClient */);
app.mActivityRecord.setVisibility(false);
assertFalse(mAtm.hasActiveVisibleWindow(uid));
app.mActivityRecord.setVisibility(true /* visible */, false /* deferHidingClient */);
app.mActivityRecord.setVisibility(true);
assertTrue(mAtm.hasActiveVisibleWindow(uid));
// Make the activity invisible and add a visible toast. The uid should have no active
// visible window because toast can be misused by legacy app to bypass background check.
app.mActivityRecord.setVisibility(false /* visible */, false /* deferHidingClient */);
app.mActivityRecord.setVisibility(false);
final WindowState overlay = createWindow(null, TYPE_APPLICATION_OVERLAY, "overlay", uid);
final WindowState toast = createWindow(null, TYPE_TOAST, app.mToken, "toast", uid);
toast.onSurfaceShownChanged(true);
@@ -1157,12 +1157,12 @@ public class WindowStateTests extends WindowTestsBase {
public void testRequestedVisibility() {
final WindowState app = createWindow(null, TYPE_APPLICATION, "app");
app.mActivityRecord.setVisible(false);
app.mActivityRecord.setVisibility(false /* visible */, false /* deferHidingClient */);
app.mActivityRecord.setVisibility(false);
assertFalse(app.isVisibleRequested());
// It doesn't have a surface yet, but should still be visible requested.
app.setHasSurface(false);
app.mActivityRecord.setVisibility(true /* visible */, false /* deferHidingClient */);
app.mActivityRecord.setVisibility(true);
assertFalse(app.isVisible());
assertTrue(app.isVisibleRequested());