[bugfix] fixup! add second factor UI

There is new code in Android 16 that gets called when hardware keyboard gets added / updated /
removed if the com.android.internal.widget.flags.hide_last_char_with_physical_input aconfig
flag is enabled.

When this happens, it seems it will always use LockDomain.Primary's setting for enhanced PIN privacy
when the external keyboard state changes; the`isPinEnhancedPrivacyEnabled` method uses Primary by
default via a method override if a LockDomain is not passed. Fix this by passing the stored
mLockDomain field.

Also fixes test failures due to mocking a function that never gets called from 2FA changes.

Test: atest SystemUITests:com.android.keyguard.KeyguardPinBasedInputViewControllerTest

Author: inthewaves

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

@@ -36,6 +36,7 @@
 import androidx.test.filters.SmallTest;
 
 import com.android.internal.util.LatencyTracker;
+import com.android.internal.widget.LockDomain;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.keyguard.KeyguardSecurityModel.SecurityMode;
 import com.android.keyguard.domain.interactor.KeyguardKeyboardInteractor;
@@ -127,7 +128,7 @@ public void setup() {
                 new KeyguardKeyboardInteractor(new FakeKeyboardRepository());
         FakeFeatureFlags featureFlags = new FakeFeatureFlags();
         mSetFlagsRule.enableFlags(com.android.systemui.Flags.FLAG_REVAMPED_BOUNCER_MESSAGES);
-        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt())).thenReturn(false);
+        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt(), any(LockDomain.class))).thenReturn(false);
         mKeyguardPinViewController = new KeyguardPinBasedInputViewController(mPinBasedInputView,
                 mKeyguardUpdateMonitor, mSecurityMode, mLockPatternUtils, mKeyguardSecurityCallback,
                 mKeyguardMessageAreaControllerFactory, mLatencyTracker,
@@ -162,7 +163,7 @@ public void testMessageIsSetWhenReset() {
     @Test
     @EnableFlags(FLAG_HIDE_LAST_CHAR_WITH_PHYSICAL_INPUT)
     public void updateAnimations_addDevice_notKeyboard() {
-        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt())).thenReturn(false);
+        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt(), any(LockDomain.class))).thenReturn(false);
         verify(mPasswordEntry, times(1)).setShowPassword(true);
         mKeyguardPinViewController.onViewAttached();
         mKeyguardPinViewController.onInputDeviceAdded(1);
@@ -172,7 +173,7 @@ public void updateAnimations_addDevice_notKeyboard() {
     @Test
     @EnableFlags(FLAG_HIDE_LAST_CHAR_WITH_PHYSICAL_INPUT)
     public void updateAnimations_addDevice_keyboard() {
-        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt())).thenReturn(true);
+        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt(), any(LockDomain.class))).thenReturn(true);
         verify(mPasswordEntry, times(1)).setShowPassword(true);
         mKeyguardPinViewController.onViewAttached();
         mKeyguardPinViewController.onInputDeviceAdded(1);
@@ -182,7 +183,7 @@ public void updateAnimations_addDevice_keyboard() {
     @Test
     @EnableFlags(FLAG_HIDE_LAST_CHAR_WITH_PHYSICAL_INPUT)
     public void updateAnimations_addDevice_multipleKeyboards() {
-        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt())).thenReturn(true);
+        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt(), any(LockDomain.class))).thenReturn(true);
         verify(mPasswordEntry, times(1)).setShowPassword(true);
         mKeyguardPinViewController.onViewAttached();
         mKeyguardPinViewController.onInputDeviceAdded(1);
@@ -194,7 +195,7 @@ public void updateAnimations_addDevice_multipleKeyboards() {
     @Test
     @EnableFlags(FLAG_HIDE_LAST_CHAR_WITH_PHYSICAL_INPUT)
     public void updateAnimations_removeDevice_notKeyboard() {
-        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt())).thenReturn(false);
+        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt(), any(LockDomain.class))).thenReturn(false);
         verify(mPasswordEntry, times(1)).setShowPassword(true);
         mKeyguardPinViewController.onViewAttached();
         mKeyguardPinViewController.onInputDeviceRemoved(1);
@@ -204,7 +205,7 @@ public void updateAnimations_removeDevice_notKeyboard() {
     @Test
     @EnableFlags(FLAG_HIDE_LAST_CHAR_WITH_PHYSICAL_INPUT)
     public void updateAnimations_removeDevice_keyboard() {
-        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt())).thenReturn(true, false);
+        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt(), any(LockDomain.class))).thenReturn(true, false);
         verify(mPasswordEntry, times(1)).setShowPassword(true);
         verify(mPasswordEntry, times(0)).setShowPassword(false);
         mKeyguardPinViewController.onViewAttached();
@@ -218,7 +219,7 @@ public void updateAnimations_removeDevice_keyboard() {
     @Test
     @EnableFlags(FLAG_HIDE_LAST_CHAR_WITH_PHYSICAL_INPUT)
     public void updateAnimations_removeDevice_multipleKeyboards() {
-        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt())).thenReturn(true, true);
+        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt(), any(LockDomain.class))).thenReturn(true, true);
         verify(mPasswordEntry, times(1)).setShowPassword(true);
         verify(mPasswordEntry, times(0)).setShowPassword(false);
         mKeyguardPinViewController.onViewAttached();
@@ -232,7 +233,7 @@ public void updateAnimations_removeDevice_multipleKeyboards() {
     @Test
     @EnableFlags(FLAG_HIDE_LAST_CHAR_WITH_PHYSICAL_INPUT)
     public void updateAnimations_updateDevice_notKeyboard() {
-        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt())).thenReturn(false);
+        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt(), any(LockDomain.class))).thenReturn(false);
         verify(mPasswordEntry, times(1)).setShowPassword(true);
         mKeyguardPinViewController.onViewAttached();
         mKeyguardPinViewController.onInputDeviceChanged(1);
@@ -242,7 +243,7 @@ public void updateAnimations_updateDevice_notKeyboard() {
     @Test
     @EnableFlags(FLAG_HIDE_LAST_CHAR_WITH_PHYSICAL_INPUT)
     public void updateAnimations_updateDevice_keyboard() {
-        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt())).thenReturn(true, false);
+        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt(), any(LockDomain.class))).thenReturn(true, false);
         verify(mPasswordEntry, times(1)).setShowPassword(true);
         verify(mPasswordEntry, times(0)).setShowPassword(false);
         mKeyguardPinViewController.onViewAttached();
@@ -256,7 +257,7 @@ public void updateAnimations_updateDevice_keyboard() {
     @Test
     @EnableFlags(FLAG_HIDE_LAST_CHAR_WITH_PHYSICAL_INPUT)
     public void updateAnimations_updateDevice_multipleKeyboards() {
-        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt())).thenReturn(true, true);
+        when(mLockPatternUtils.isPinEnhancedPrivacyEnabled(anyInt(), any(LockDomain.class))).thenReturn(true, true);
         verify(mPasswordEntry, times(1)).setShowPassword(true);
         verify(mPasswordEntry, times(0)).setShowPassword(false);
         mKeyguardPinViewController.onViewAttached();

packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputViewController.java

@@ -117,7 +117,8 @@ private void updateAnimations(Boolean showAnimations) {
 
         if (showAnimations == null) {
             showAnimations = !mLockPatternUtils
-                .isPinEnhancedPrivacyEnabled(mSelectedUserInteractor.getSelectedUserId());
+                .isPinEnhancedPrivacyEnabled(mSelectedUserInteractor.getSelectedUserId(),
+                        mLockDomain);
         }
         if (mShowAnimations != null && showAnimations.equals(mShowAnimations)) return;
         mShowAnimations = showAnimations;