commit 5b9653f58100a47130618bcbdb7422b2030fd459
author Diya Bera <diyab@google.com> Mon Jan 09 23:52:34 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jan 13 02:59:44 2023 +0000
tree e521de25d2132a52f1b3b5086f0272766a5bdf63
parent 6d0bd58e7f5eb4d1eecad3279568c5483e0fdced

Fixes background color in SUW fingerprint enrollment

Test: Manual (Enroll fingerprint in SUW, background color remains the
same)
Bug: 246231650
Bug: 250464527

Change-Id: Iffd1543d8b230199c3b925c6538bd418a381c96a
(cherry picked from commit 00dfcd83dc9acab5a49d24773bd23d5969257b36)
Merged-In: Iffd1543d8b230199c3b925c6538bd418a381c96a

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

diff --git a/src/com/android/settings/biometrics/BiometricUtils.java b/src/com/android/settings/biometrics/BiometricUtils.java
index 4cd2f790..9cc656c 100644
--- a/src/com/android/settings/biometrics/BiometricUtils.java
+++ b/src/com/android/settings/biometrics/BiometricUtils.java
@@ -39,6 +39,7 @@
 import com.android.settings.biometrics.face.FaceEnrollIntroduction;
 import com.android.settings.biometrics.fingerprint.FingerprintEnrollFindSensor;
 import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction;
+import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor;
 import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroduction;
 import com.android.settings.password.ChooseLockGeneric;
 import com.android.settings.password.ChooseLockSettingsHelper;
@@ -152,9 +153,13 @@
      */
     public static Intent getFingerprintFindSensorIntent(@NonNull Context context,
             @NonNull Intent activityIntent) {
-        Intent intent = new Intent(context, FingerprintEnrollFindSensor.class);
-        SetupWizardUtils.copySetupExtras(activityIntent, intent);
-        return intent;
+        if (WizardManagerHelper.isAnySetupWizard(activityIntent)) {
+            Intent intent = new Intent(context, SetupFingerprintEnrollFindSensor.class);
+            SetupWizardUtils.copySetupExtras(activityIntent, intent);
+            return intent;
+        } else {
+            return new Intent(context, FingerprintEnrollFindSensor.class);
+        }
     }
 
     /**