Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc am: e30a71787e am: 54b7ac755a

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

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

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

@@ -240,7 +240,6 @@ public class BiometricUtils {
         return activity.getIntent().hasExtra(MultiBiometricEnrollHelper.EXTRA_ENROLL_AFTER_FACE);
     }
 
-
     /**
      * Used for checking if a multi-biometric enrollment flowstarts with Fingerprint
      * and ends with Face.
@@ -254,6 +253,18 @@ public class BiometricUtils {
                 MultiBiometricEnrollHelper.EXTRA_ENROLL_AFTER_FINGERPRINT);
     }
 
+    /**
+     * Used to check if the activity is a multi biometric flow activity.
+     *
+     * @param activity Activity to check
+     * @return True if the activity is going through a multi-biometric enrollment flow, that starts
+     * with Fingerprint.
+     */
+    public static boolean isAnyMultiBiometricFlow(@NonNull Activity activity) {
+        return isMultiBiometricFaceEnrollmentFlow(activity)
+                || isMultiBiometricFingerprintEnrollmentFlow(activity);
+    }
+
     public static void copyMultiBiometricExtras(@NonNull Intent fromIntent,
             @NonNull Intent toIntent) {
         PendingIntent pendingIntent = (PendingIntent) fromIntent.getExtra(