diff options
author | Curtis Belmonte <curtislb@google.com> | 2019-12-18 11:13:47 -0800 |
---|---|---|
committer | Curtis Belmonte <curtislb@google.com> | 2020-01-02 11:06:29 -0800 |
commit | 4ac1d25c2a1fa7c7c6b704566dcdfdaef9f320b1 (patch) | |
tree | 3e5ad5921022c7a5b2b699848cdc8cabf826511e /src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java | |
parent | 6b7b92ced519ffb2f2c0e34f6aa7ad53a9a8ce9f (diff) | |
download | packages_apps_Settings-4ac1d25c2a1fa7c7c6b704566dcdfdaef9f320b1.tar.gz packages_apps_Settings-4ac1d25c2a1fa7c7c6b704566dcdfdaef9f320b1.tar.bz2 packages_apps_Settings-4ac1d25c2a1fa7c7c6b704566dcdfdaef9f320b1.zip |
Finish biometric enroll screens when backgrounded
Currently, there are some biometric security setting and enrollment
screens which remain open after the user has backgrounded them. This
means that they can later be resumed without requiring the user to
confirm their device credential as normal.
This commit fixes the issue in AOSP by adding logic to the affected
biometric enrollment/setting activities in to finish() with
RESULT_TIMEOUT in onStop(). We don't want to finish() these activities
prematurely if the user is currently in a wizard setup flow, however. In
that case, this commit ensures that the newly added logic will not run.
Test: Pixel 3 - Background at each step of fingerprint enroll => finish
Test: Pixel 3 - Rotate at each step of fingerprint enroll => no finish
Test: Pixel 3 - Proceed though fingerprint setup wizard => no change
Bug: 142544519
Change-Id: I8ec0fa1e30bafe097d9dc82991ff786ebf24844b
Diffstat (limited to 'src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java')
-rw-r--r-- | src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java index 073c7e65e3..6709a6ab81 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java @@ -100,16 +100,6 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { } @Override - protected void onStop() { - super.onStop(); - - if (!isChangingConfigurations() && !mConfirmingCredentials && !mNextClicked - && !WizardManagerHelper.isAnySetupWizard(getIntent())) { - finish(); - } - } - - @Override protected boolean isDisabledByAdmin() { return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled( this, DevicePolicyManager.KEYGUARD_DISABLE_FACE, mUserId) != null; |