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

Commit 0b97de6e authored by Brad Hinegardner's avatar Brad Hinegardner Committed by Android (Google) Code Review
Browse files

Merge "Adjust falsing tests for flag rollout" into main

parents 7ab5adc9 a934dcb1

packages/SystemUI/multivalentTests/src/com/android/systemui/classifier/BrightLineFalsingManagerTest.java

+12 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ import static org.mockito.Mockito.never; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.view.MotionEvent;

import android.view.accessibility.AccessibilityManager;
@@ -33,6 +35,7 @@ import androidx.test.filters.SmallTest; 


import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.testing.FakeMetricsLogger;

import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -201,12 +204,21 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase { 
    }



    @Test

    @DisableFlags(Flags.FLAG_NON_TOUCHSCREEN_DEVICES_BYPASS_FALSING)

    public void testTrackpadGesture() {

        assertThat(mBrightLineFalsingManager.isFalseTouch(Classifier.GENERIC)).isTrue();

        when(mFalsingDataProvider.isFromTrackpad()).thenReturn(true);

        assertThat(mBrightLineFalsingManager.isFalseTouch(Classifier.GENERIC)).isFalse();

    }



    @Test

    @EnableFlags(Flags.FLAG_NON_TOUCHSCREEN_DEVICES_BYPASS_FALSING)

    public void testTrackpadGesture_touchScreenSource_false() {

        assertThat(mBrightLineFalsingManager.isFalseTouch(Classifier.GENERIC)).isTrue();

        when(mFalsingDataProvider.isTouchScreenSource()).thenReturn(false);

        assertThat(mBrightLineFalsingManager.isFalseTouch(Classifier.GENERIC)).isFalse();

    }



    @Test

    public void testAddAndRemoveFalsingBeliefListener() {

        verify(mHistoryTracker, never()).addBeliefListener(any());

packages/SystemUI/multivalentTests/src/com/android/systemui/classifier/FalsingDataProviderTest.java

+1 −0
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ public class FalsingDataProviderTest extends ClassifierTest { 
    }



    @Test

    @DisableFlags(Flags.FLAG_NON_TOUCHSCREEN_DEVICES_BYPASS_FALSING)

    public void test_IsFromTrackpad() {

        MotionEvent motionEventOrigin = appendTrackpadDownEvent(0, 0);

packages/SystemUI/src/com/android/systemui/classifier/FalsingDataProvider.java

+2 −0
Original line number Diff line number Diff line
@@ -282,6 +282,8 @@ public class FalsingDataProvider { 
        return !mRecentKeyEvents.isEmpty();

    }



    // Deprecated in favor of {@code isTouchScreenSource}, b/329221787

    @Deprecated

    public boolean isFromTrackpad() {

        if (Flags.nonTouchscreenDevicesBypassFalsing()) {

            return false;