summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vincent Wang <firewall@google.com> 2023-03-16 02:59:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-16 02:59:13 +0000
commit747d8bdf3cfff56e666e6b346274208b81149ff9 (patch)
treec9bfd0d3842f9b44dca58c261a770f501970e975
parent4002108d9bb9a756d032d6c2d1fdb652c66db802 (diff)
parent10a3ecd77c2160be370fb44d967df130f21dcca5 (diff)
Merge "Fix FingerprintManager won't display BP on SFPS devices" into tm-qpr-dev am: 10a3ecd77c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21981865 Change-Id: Iff0193d45b609c18869c4acc947bfb3c0c51a671 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java
index 598e2b990ea5..d55dd8ab85f8 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java
@@ -343,7 +343,8 @@ public class FingerprintService extends SystemService {
final FingerprintSensorPropertiesInternal sensorProps =
provider.second.getSensorProperties(sensorId);
if (!isKeyguard && !Utils.isSettings(getContext(), opPackageName)
- && sensorProps != null && sensorProps.isAnyUdfpsType()) {
+ && sensorProps != null && (sensorProps.isAnyUdfpsType()
+ || sensorProps.isAnySidefpsType())) {
try {
return authenticateWithPrompt(operationId, sensorProps, callingUid,
callingUserId, receiver, opPackageName, ignoreEnrollmentState);