From a2133c2b001db647361e307f6c6ac2b36d31fb78 Mon Sep 17 00:00:00 2001 From: Joshua Mccloskey Date: Wed, 30 Nov 2022 00:07:06 +0000 Subject: [PATCH] Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro." This reverts commit 3ca9965a9693894e913d4b97819b27aa0b644e21. Reason for revert: b/259709482 Change-Id: I1fcc8b3ecd42859af591a7b250edfedbbdf204e4 Merged-In: I1fcc8b3ecd42859af591a7b250edfedbbdf204e4 --- .../fingerprint/FingerprintStatusUtils.java | 4 +--- .../fingerprint/FingerprintStatusUtilsTest.java | 14 +------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtils.java b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtils.java index 18db774214c..71cdcf73b84 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtils.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtils.java @@ -78,9 +78,7 @@ public class FingerprintStatusUtils { * Returns the class name of the Settings page corresponding to fingerprint settings. */ public String getSettingsClassName() { - return !hasEnrolled() && isAvailable() - ? FingerprintEnrollIntroductionInternal.class.getName() - : FingerprintSettings.class.getName(); + return FingerprintSettings.class.getName(); } /** diff --git a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtilsTest.java b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtilsTest.java index a5d74a03500..69e5e2f485b 100644 --- a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtilsTest.java +++ b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtilsTest.java @@ -179,20 +179,8 @@ public class FingerprintStatusUtilsTest { } @Test - public void getSettingsClassName_whenNotEnrolled_fingerprintOnly_returnsFingerprintEnrollInduction() { + public void getSettingsClassName_whenNotEnrolled_returnsFingerprintSettings() { when(mFingerprintManager.hasEnrolledFingerprints(anyInt())).thenReturn(false); - when(mFingerprintManager.isHardwareDetected()).thenReturn(true); - when(mFaceManager.isHardwareDetected()).thenReturn(false); - - assertThat(mFingerprintStatusUtils.getSettingsClassName()) - .isEqualTo(FingerprintEnrollIntroductionInternal.class.getName()); - } - - @Test - public void getSettingsClassName_whenNotEnrolled_fingerprintNotOnly_returnsFingerprintSettings() { - when(mFingerprintManager.hasEnrolledFingerprints(anyInt())).thenReturn(false); - when(mFingerprintManager.isHardwareDetected()).thenReturn(true); - when(mFaceManager.isHardwareDetected()).thenReturn(true); assertThat(mFingerprintStatusUtils.getSettingsClassName()) .isEqualTo(FingerprintSettings.class.getName());