Merge "Device displays fingerprint enrollment after swiping back" into tm-qpr-dev am: dfe2bd2df2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20497232

Change-Id: I3a0bcd951ba560a25e257f3dbe4c9657a1e82134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java b/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
index 5d0b63c..a994b95 100644
--- a/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
+++ b/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
@@ -103,10 +103,9 @@
                         0 /* requestCode */, faceIntent,
                         PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
                 intent.putExtra(EXTRA_ENROLL_AFTER_FINGERPRINT, faceAfterFp);
-
-                BiometricUtils.launchEnrollForResult(mActivity, intent, REQUEST_FINGERPRINT_ENROLL,
-                        hardwareAuthToken, mGkPwHandle, mUserId);
             }
+            BiometricUtils.launchEnrollForResult(mActivity, intent, REQUEST_FINGERPRINT_ENROLL,
+                    hardwareAuthToken, mGkPwHandle, mUserId);
         }));
     }
 }