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

Commit 940f264e authored by Vincent Wang's avatar Vincent Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix FingerprintManager won't display BP on SFPS devices" into... 

Merge "Fix FingerprintManager won't display BP on SFPS devices" into tm-qpr-dev am: 10a3ecd7 am: 747d8bdf

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



Change-Id: Icbf2287cb10881f7e749cd58fcfdceba70507d71
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 83b5bfc0 747d8bdf

services/core/java/com/android/server/biometrics/sensors/fingerprint/FingerprintService.java

+2 −1
Original line number Diff line number Diff line
@@ -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,