Merge "Hide unnecessary test method" into udc-dev
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index 9def87c..37e4890 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -5228,8 +5228,7 @@
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
diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
index 6661e6a..49f215a 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
@@ -2897,7 +2897,7 @@
// 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();
diff --git a/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java b/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java
index 4d71b30..6d13124 100644
--- a/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java
@@ -165,7 +165,7 @@
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());
diff --git a/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java b/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java
index 6b814e6..59cc4f5 100644
--- a/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java
@@ -295,8 +295,8 @@
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 @@
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.
diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskFragmentTest.java b/services/tests/wmtests/src/com/android/server/wm/TaskFragmentTest.java
index df3af7d..49d8da1 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TaskFragmentTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TaskFragmentTest.java
@@ -351,8 +351,8 @@
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.
diff --git a/services/tests/wmtests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java
index 2fccb88a..75a8dd8 100644
--- a/services/tests/wmtests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java
@@ -92,11 +92,11 @@
@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());
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
index 3aee2cd..33067df 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
@@ -914,15 +914,15 @@
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 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());