Merge "Fix FingerprintManager won't display BP on SFPS devices" into tm-qpr-dev am: 10a3ecd77c am: 747d8bdf3c am: 940f264ed5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21981865 Change-Id: Ib4bbec7b5c202717030e5b870d52f912af8a9ab6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -314,7 +314,8 @@ public class FingerprintService extends SystemService {
|
|||||||
final FingerprintSensorPropertiesInternal sensorProps =
|
final FingerprintSensorPropertiesInternal sensorProps =
|
||||||
provider.second.getSensorProperties(options.getSensorId());
|
provider.second.getSensorProperties(options.getSensorId());
|
||||||
if (!isKeyguard && !Utils.isSettings(getContext(), opPackageName)
|
if (!isKeyguard && !Utils.isSettings(getContext(), opPackageName)
|
||||||
&& sensorProps != null && sensorProps.isAnyUdfpsType()) {
|
&& sensorProps != null && (sensorProps.isAnyUdfpsType()
|
||||||
|
|| sensorProps.isAnySidefpsType())) {
|
||||||
try {
|
try {
|
||||||
return authenticateWithPrompt(operationId, sensorProps, callingUid,
|
return authenticateWithPrompt(operationId, sensorProps, callingUid,
|
||||||
callingUserId, receiver, opPackageName,
|
callingUserId, receiver, opPackageName,
|
||||||
|
|||||||
Reference in New Issue
Block a user