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

Commit 4e0d9e43 authored by Brad Hinegardner's avatar Brad Hinegardner
Browse files

Remove released legacy sysui flag 

Fixes: 262859270
Test: atest BrightLineClassifierTest
Test: atest BrightLineFalsingManagerTest
Flag: EXEMPT bug fix
Change-Id: I3563d99a3d39fa5108883e521395d6c9ef087ea8
parent a776451e

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

+1 −5
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ import androidx.test.filters.SmallTest; 
import com.android.internal.logging.MetricsLogger;

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

import com.android.systemui.SysuiTestCase;

import com.android.systemui.flags.FakeFeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -83,7 +81,6 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase { 
    private final FalsingClassifier.Result mPassedResult = FalsingClassifier.Result.passed(1);

    private final FalsingClassifier.Result mFalsedResult =

            FalsingClassifier.Result.falsed(1, getClass().getSimpleName(), "");

    private final FakeFeatureFlags mFakeFeatureFlags = new FakeFeatureFlags();



    @Before

    public void setup() {
@@ -101,8 +98,7 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase { 
        mBrightLineFalsingManager = new BrightLineFalsingManager(mFalsingDataProvider,

                mMetricsLogger, mClassifiers, mSingleTapClassifier, mLongTapClassifier,

                mDoubleTapClassifier, mHistoryTracker, mKeyguardStateController,

                mAccessibilityManager, false, mFakeFeatureFlags);

        mFakeFeatureFlags.set(Flags.FALSING_OFF_FOR_UNFOLDED, true);

                mAccessibilityManager, false);

    }



    @Test

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

+2 −6
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ public class BrightLineFalsingManager implements FalsingManager { 
    private final boolean mTestHarness;

    private final MetricsLogger mMetricsLogger;

    private int mIsFalseTouchCalls;

    private FeatureFlags mFeatureFlags;

    private static final Queue<String> RECENT_INFO_LOG =

            new ArrayDeque<>(RECENT_INFO_LOG_SIZE + 1);

    private static final Queue<DebugSwipeRecord> RECENT_SWIPES =
@@ -186,8 +185,7 @@ public class BrightLineFalsingManager implements FalsingManager { 
            DoubleTapClassifier doubleTapClassifier, HistoryTracker historyTracker,

            KeyguardStateController keyguardStateController,

            AccessibilityManager accessibilityManager,

            @TestHarness boolean testHarness,

            FeatureFlags featureFlags) {

            @TestHarness boolean testHarness) {

        mDataProvider = falsingDataProvider;

        mMetricsLogger = metricsLogger;

        mClassifiers = classifiers;
@@ -198,7 +196,6 @@ public class BrightLineFalsingManager implements FalsingManager { 
        mKeyguardStateController = keyguardStateController;

        mAccessibilityManager = accessibilityManager;

        mTestHarness = testHarness;

        mFeatureFlags = featureFlags;



        mDataProvider.addSessionListener(mSessionListener);

        mDataProvider.addGestureCompleteListener(mGestureFinalizedListener);
@@ -399,8 +396,7 @@ public class BrightLineFalsingManager implements FalsingManager { 
                || mDataProvider.isA11yAction()

                || mDataProvider.isFromTrackpad()

                || mDataProvider.isFromKeyboard()

                || (mFeatureFlags.isEnabled(Flags.FALSING_OFF_FOR_UNFOLDED)

                    && mDataProvider.isUnfolded());

                || mDataProvider.isUnfolded();

    }



    @Override

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −3
Original line number Diff line number Diff line
@@ -98,9 +98,6 @@ object Flags { 
    @JvmField

    val AUTO_PIN_CONFIRMATION = releasedFlag("auto_pin_confirmation", "auto_pin_confirmation")



    // TODO(b/262859270): Tracking Bug

    @JvmField val FALSING_OFF_FOR_UNFOLDED = releasedFlag("falsing_off_for_unfolded")



    /** Enables code to show contextual loyalty cards in wallet entrypoints */

    // TODO(b/294110497): Tracking Bug

    @JvmField

packages/SystemUI/tests/src/com/android/systemui/classifier/BrightLineClassifierTest.java

+1 −5
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ import com.android.internal.logging.MetricsLogger; 
import com.android.internal.logging.testing.FakeMetricsLogger;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.classifier.FalsingDataProvider.GestureFinalizedListener;

import com.android.systemui.flags.FakeFeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.util.concurrency.FakeExecutor;

import com.android.systemui.util.time.FakeSystemClock;
@@ -84,7 +82,6 @@ public class BrightLineClassifierTest extends SysuiTestCase { 
    private AccessibilityManager mAccessibilityManager;



    private final FakeExecutor mFakeExecutor = new FakeExecutor(new FakeSystemClock());

    private final FakeFeatureFlags mFakeFeatureFlags = new FakeFeatureFlags();



    private final FalsingClassifier.Result mFalsedResult =

            FalsingClassifier.Result.falsed(1, getClass().getSimpleName(), "");
@@ -110,7 +107,7 @@ public class BrightLineClassifierTest extends SysuiTestCase { 
        mBrightLineFalsingManager = new BrightLineFalsingManager(mFalsingDataProvider,

                mMetricsLogger, mClassifiers, mSingleTapClassfier, mLongTapClassifier,

                mDoubleTapClassifier, mHistoryTracker, mKeyguardStateController,

                mAccessibilityManager, false, mFakeFeatureFlags);

                mAccessibilityManager, false);





        ArgumentCaptor<GestureFinalizedListener> gestureCompleteListenerCaptor =
@@ -120,7 +117,6 @@ public class BrightLineClassifierTest extends SysuiTestCase { 
                gestureCompleteListenerCaptor.capture());



        mGestureFinalizedListener = gestureCompleteListenerCaptor.getValue();

        mFakeFeatureFlags.set(Flags.FALSING_OFF_FOR_UNFOLDED, true);

    }



    @Test