commit 4e8b9135c36282875e94f24768437b613e25bd9c
author Diya Bera <diyab@google.com> Thu Nov 17 01:38:36 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 17 01:38:36 2022 +0000
tree 08ab466d9526f73913f4081565337ad1b7cba853
parent f8b496dfd5d31a41e55afbea2ba348fb979b67a0
parent 6c1eae8a1e3b4d673f1fc1b636795e064d099da0

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

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

Change-Id: I2814b4cd69881415a5a4105058f00973b29a3000
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java

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);
         }));
     }
 }