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

Commit 10dd6238 authored by Prabir Pradhan's avatar Prabir Pradhan
Browse files

Disable Test for TaskTapPointerEventListener when it is removed 

The test injects taps directly into mTapDetector, which is removed when
the flag is enabled. Add RequiresFlagsDisabled condition to the affected
test case.

Bug: 311393948
Bug: 318372941
Test: atest DisplayContentTests
Change-Id: Ibeedbbb7c7c16b0f80cba35f1cbf8a1b6ae9b558
parent 3a751f12

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

+9 −0
Original line number Diff line number Diff line
@@ -115,6 +115,9 @@ import android.os.Binder; 
import android.os.RemoteException;

import android.os.SystemClock;

import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.util.ArraySet;

import android.util.DisplayMetrics;

import android.view.Display;
@@ -146,6 +149,7 @@ import com.android.server.LocalServices; 
import com.android.server.policy.WindowManagerPolicy;

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



import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;
@@ -172,6 +176,10 @@ import java.util.concurrent.TimeoutException; 
@RunWith(WindowTestRunner.class)

public class DisplayContentTests extends WindowTestsBase {



    @Rule

    public final CheckFlagsRule mCheckFlagsRule =

            DeviceFlagsValueProvider.createCheckFlagsRule();



    @SetupWindows(addAllCommonWindows = true)

    @Test

    public void testForAllWindows() {
@@ -508,6 +516,7 @@ public class DisplayContentTests extends WindowTestsBase { 
     * Tests tapping on a root task in different display results in window gaining focus.

     */

    @Test

    @RequiresFlagsDisabled(com.android.input.flags.Flags.FLAG_REMOVE_POINTER_EVENT_TRACKING_IN_WM)

    public void testInputEventBringsCorrectDisplayInFocus() {

        DisplayContent dc0 = mWm.getDefaultDisplayContentLocked();

        // Create a second display