Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2cae487 authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge "BP reason is always higher priority than Settings" into sc-v2-dev am:... 

Merge "BP reason is always higher priority than Settings" into sc-v2-dev am: 969296a6 am: 1eb67487

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16421426

Change-Id: I39e62fc2ef145d5a45aa1f2c62af8ce17489f17e
parents 8bf5213e 1eb67487

services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java

+6 −2
Original line number Diff line number Diff line
@@ -503,10 +503,14 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> 
    protected int getShowOverlayReason() {

        if (isKeyguard()) {

            return BiometricOverlayConstants.REASON_AUTH_KEYGUARD;

        } else if (isSettings()) {

            return BiometricOverlayConstants.REASON_AUTH_SETTINGS;

        } else if (isBiometricPrompt()) {

            // BP reason always takes precedent over settings, since callers from within

            // settings can always invoke BP.

            return BiometricOverlayConstants.REASON_AUTH_BP;

        } else if (isSettings()) {

            // This is pretty much only for FingerprintManager#authenticate usage from

            // FingerprintSettings.

            return BiometricOverlayConstants.REASON_AUTH_SETTINGS;

        } else {

            return BiometricOverlayConstants.REASON_AUTH_OTHER;

        }