Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I8c176124524557d0423fc289eecd6951d84a2312
This commit is contained in:
Kevin Chyn
2021-12-08 22:58:31 +00:00
committed by Automerger Merge Worker
parent eabf81be53 969296a67b
commit 1eb6748729
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java
View File

@@ -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;
} }