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

Commit d62c5e97 authored by Kevin Chyn's avatar Kevin Chyn
Browse files

BP reason is always higher priority than Settings 

Fixes: 209193668
Test: share wifi, no longer two icons
Change-Id: I89cf6e1dd3889333ac5812fe9759d1b25367d818
parent f811df0e

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

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

    protected int getShowOverlayReason() {

        if (isKeyguard()) {

        if (isKeyguard()) {

            return BiometricOverlayConstants.REASON_AUTH_KEYGUARD;

            return BiometricOverlayConstants.REASON_AUTH_KEYGUARD;

        } else if (isSettings()) {

            return BiometricOverlayConstants.REASON_AUTH_SETTINGS;

        } else if (isBiometricPrompt()) {

        } else if (isBiometricPrompt()) {

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

            // settings can always invoke BP.

            return BiometricOverlayConstants.REASON_AUTH_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 {

        } else {

            return BiometricOverlayConstants.REASON_AUTH_OTHER;

            return BiometricOverlayConstants.REASON_AUTH_OTHER;

        }

        }