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

Commit a5afac36 authored by Eghosa Ewansiha-Vlachavas's avatar Eghosa Ewansiha-Vlachavas
Browse files

[2/n] Re-enable tests that were disabled as part of desktop mode flag rollout 

While rolling out the desktop mode flag, a number of tests were failing due to coexistence issues with desktop mode and the existing freeform and multi-display behaviours. As a result, these tests were temporarily
disabled on devices with desktop mode enabled.

However, following ag/27155182, a number of these tests are now passing
and can thus be re-enabled.

Fixes: 338196631
Test: atest CtsWindowManagerDeviceActivity:ActivityStarterTests
Change-Id: I637d33c1938b63f18476d9b63b082c6a7b1f1fa9
parent 09b0a7c5

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

+0 −9
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_INSTANCE; 
import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_TASK;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.os.Process.SYSTEM_UID;

import static android.server.wm.ActivityManagerTestBase.isTablet;



import static com.android.dx.mockito.inline.extended.ExtendedMockito.clearInvocations;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.doAnswer;
@@ -76,7 +75,6 @@ import static org.junit.Assert.assertNotEquals; 
import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;

import static org.junit.Assume.assumeFalse;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyInt;
@@ -124,7 +122,6 @@ import com.android.server.pm.pkg.AndroidPackage; 
import com.android.server.wm.BackgroundActivityStartController.BalVerdict;

import com.android.server.wm.LaunchParamsController.LaunchParamsModifier;

import com.android.server.wm.utils.MockTracker;

import com.android.window.flags.Flags;



import org.junit.After;

import org.junit.Before;
@@ -1298,12 +1295,6 @@ public class ActivityStarterTests extends WindowTestsBase { 
     */

    @Test

    public void testDeliverIntentToTopActivityOfNonTopDisplay() {

        // TODO(b/330152508): Remove check once legacy multi-display behaviour can coexist with

        //  desktop windowing mode

        // Ignore test if desktop windowing is enabled on tablets as legacy multi-display

        // behaviour will not be respected

        assumeFalse(Flags.enableDesktopWindowingMode() && isTablet());



        final ActivityStarter starter = prepareStarter(FLAG_ACTIVITY_NEW_TASK,

                false /* mockGetRootTask */);