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

Commit 91480b77 authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge "Remove shipped flag for double PIN submission" into main

parents 7db620f5 e942635b

packages/SystemUI/aconfig/systemui.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -1513,16 +1513,6 @@ flag { 
   }

}



flag {

   name: "sim_pin_talkback_fix_for_double_submit"

   namespace: "systemui"

   description: "The SIM PIN entry screens show the wrong message due"

   bug: "346932439"

   metadata {

        purpose: PURPOSE_BUGFIX

   }

}



flag {

   name: "sim_pin_bouncer_reset"

   namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardPinBasedInputViewControllerTest.java

+1 −3
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ public class KeyguardPinBasedInputViewControllerTest extends SysuiTestCase { 
    @Mock

    private LatencyTracker mLatencyTracker;

    @Mock

    private LiftToActivateListener mLiftToactivateListener;

    @Mock

    private EmergencyButtonController mEmergencyButtonController;

    private FalsingCollector mFalsingCollector = new FalsingCollectorFake();

    @Mock
@@ -122,7 +120,7 @@ public class KeyguardPinBasedInputViewControllerTest extends SysuiTestCase { 
        mSetFlagsRule.enableFlags(com.android.systemui.Flags.FLAG_REVAMPED_BOUNCER_MESSAGES);

        mKeyguardPinViewController = new KeyguardPinBasedInputViewController(mPinBasedInputView,

                mKeyguardUpdateMonitor, mSecurityMode, mLockPatternUtils, mKeyguardSecurityCallback,

                mKeyguardMessageAreaControllerFactory, mLatencyTracker, mLiftToactivateListener,

                mKeyguardMessageAreaControllerFactory, mLatencyTracker,

                mEmergencyButtonController, mFalsingCollector, featureFlags,

                mSelectedUserInteractor, keyguardKeyboardInteractor, mBouncerHapticPlayer,

                mUserActivityNotifier) {

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardPinViewControllerTest.kt

+0 −3
Original line number Diff line number Diff line
@@ -90,8 +90,6 @@ class KeyguardPinViewControllerTest : SysuiTestCase() { 


    @Mock private lateinit var mLatencyTracker: LatencyTracker



    @Mock private lateinit var liftToActivateListener: LiftToActivateListener



    @Mock private val mEmergencyButtonController: EmergencyButtonController? = null

    private val falsingCollector: FalsingCollector = FalsingCollectorFake()

    private val keyguardKeyboardInteractor = KeyguardKeyboardInteractor(FakeKeyboardRepository())
@@ -147,7 +145,6 @@ class KeyguardPinViewControllerTest : SysuiTestCase() { 
            mKeyguardSecurityCallback,

            keyguardMessageAreaControllerFactory,

            mLatencyTracker,

            liftToActivateListener,

            mEmergencyButtonController,

            falsingCollector,

            postureController,

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardSimPinViewControllerTest.kt

+0 −2
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ class KeyguardSimPinViewControllerTest : SysuiTestCase() { 
    @Mock private lateinit var keyguardSecurityCallback: KeyguardSecurityCallback

    @Mock private lateinit var messageAreaControllerFactory: KeyguardMessageAreaController.Factory

    @Mock private lateinit var latencyTracker: LatencyTracker

    @Mock private lateinit var liftToActivateListener: LiftToActivateListener

    @Mock private lateinit var telephonyManager: TelephonyManager

    @Mock private lateinit var falsingCollector: FalsingCollector

    @Mock private lateinit var emergencyButtonController: EmergencyButtonController
@@ -100,7 +99,6 @@ class KeyguardSimPinViewControllerTest : SysuiTestCase() { 
                keyguardSecurityCallback,

                messageAreaControllerFactory,

                latencyTracker,

                liftToActivateListener,

                telephonyManager,

                falsingCollector,

                emergencyButtonController,

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardSimPukViewControllerTest.kt

+0 −2
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ class KeyguardSimPukViewControllerTest : SysuiTestCase() { 
    @Mock private lateinit var keyguardSecurityCallback: KeyguardSecurityCallback

    @Mock private lateinit var messageAreaControllerFactory: KeyguardMessageAreaController.Factory

    @Mock private lateinit var latencyTracker: LatencyTracker

    @Mock private lateinit var liftToActivateListener: LiftToActivateListener

    @Mock private lateinit var telephonyManager: TelephonyManager

    @Mock private lateinit var falsingCollector: FalsingCollector

    @Mock private lateinit var emergencyButtonController: EmergencyButtonController
@@ -95,7 +94,6 @@ class KeyguardSimPukViewControllerTest : SysuiTestCase() { 
                keyguardSecurityCallback,

                messageAreaControllerFactory,

                latencyTracker,

                liftToActivateListener,

                telephonyManager,

                falsingCollector,

                emergencyButtonController,