summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vincent Wang <firewall@google.com> 2023-03-16 03:34:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-16 03:34:58 +0000
commit940f264ed55bf7d175485957e0897752e7368da5 (patch)
tree2b281b8342a622d7201f239f30e11ea9a47197a4
parent83b5bfc0eba7d0bd329c95cd21a8ffb99a85a872 (diff)
parent747d8bdf3cfff56e666e6b346274208b81149ff9 (diff)
Merge "Fix FingerprintManager won't display BP on SFPS devices" into tm-qpr-dev am: 10a3ecd77c am: 747d8bdf3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21981865 Change-Id: Icbf2287cb10881f7e749cd58fcfdceba70507d71 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 dc00ffc9f922..01ffc7e29ac0 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
@@ -314,7 +314,8 @@ public class FingerprintService extends SystemService {
final FingerprintSensorPropertiesInternal sensorProps =
provider.second.getSensorProperties(options.getSensorId());
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,