Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c644ec8 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Hide unnecessary test method 

To avoid confusing to choose the method for updating activity
record visibility.

Bug: 163976519
Test: WmTests
Change-Id: I6d0f083012b0fcf6829032c12e63e0b7858c3f87
parent dd218cba

services/core/java/com/android/server/wm/ActivityRecord.java

+1 −2
Original line number Diff line number Diff line
@@ -5224,8 +5224,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

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

+1 −1
Original line number Diff line number Diff line
@@ -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();

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

+1 −1
Original line number Diff line number Diff line
@@ -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());

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

+3 −3
Original line number Diff line number Diff line
@@ -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.

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

+2 −2
Original line number Diff line number Diff line
@@ -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.