diff options
Diffstat (limited to 'core/java')
3 files changed, 27 insertions, 3 deletions
diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java index 6a0772db34d2..88d5ba8be8ab 100644 --- a/core/java/android/hardware/fingerprint/FingerprintManager.java +++ b/core/java/android/hardware/fingerprint/FingerprintManager.java @@ -23,6 +23,7 @@ import static android.Manifest.permission.TEST_BIOMETRIC; import static android.Manifest.permission.USE_BIOMETRIC; import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL; import static android.Manifest.permission.USE_FINGERPRINT; +import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_POWER_BUTTON; import static com.android.internal.util.FrameworkStatsLog.AUTH_DEPRECATED_APIUSED__DEPRECATED_API__API_FINGERPRINT_MANAGER_AUTHENTICATE; import static com.android.internal.util.FrameworkStatsLog.AUTH_DEPRECATED_APIUSED__DEPRECATED_API__API_FINGERPRINT_MANAGER_HAS_ENROLLED_FINGERPRINTS; @@ -878,6 +879,19 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing } /** + * Forwards FingerprintStateListener to FingerprintService + * @param listener new FingerprintStateListener being added + * @hide + */ + public void registerFingerprintStateListener(@NonNull FingerprintStateListener listener) { + try { + mService.registerFingerprintStateListener(listener); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** * @hide */ @RequiresPermission(USE_BIOMETRIC_INTERNAL) @@ -989,6 +1003,16 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing } /** + * Returns whether the device has a power button fingerprint sensor. + * @return boolean indicating whether power button is fingerprint sensor + * @hide + */ + public boolean isPowerbuttonFps() { + final FingerprintSensorPropertiesInternal sensorProps = getFirstFingerprintSensor(); + return sensorProps.sensorType == TYPE_POWER_BUTTON; + } + + /** * @hide */ public void addLockoutResetCallback(final LockoutResetCallback callback) { diff --git a/core/java/android/hardware/fingerprint/IFingerprintService.aidl b/core/java/android/hardware/fingerprint/IFingerprintService.aidl index 4bb3ab6e1bc6..3bceacb5e479 100644 --- a/core/java/android/hardware/fingerprint/IFingerprintService.aidl +++ b/core/java/android/hardware/fingerprint/IFingerprintService.aidl @@ -156,6 +156,6 @@ interface IFingerprintService { // Sets the controller for managing the UDFPS overlay. void setUdfpsOverlayController(in IUdfpsOverlayController controller); - // Registers FingerprintStateListener in list stored by FingerprintService + // Registers FingerprintStateListener in list stored by FingerprintService. void registerFingerprintStateListener(IFingerprintStateListener listener); } diff --git a/core/java/android/hardware/fingerprint/IFingerprintStateListener.aidl b/core/java/android/hardware/fingerprint/IFingerprintStateListener.aidl index a4d34afcfcf4..56dba7ea1d9a 100644 --- a/core/java/android/hardware/fingerprint/IFingerprintStateListener.aidl +++ b/core/java/android/hardware/fingerprint/IFingerprintStateListener.aidl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 The Android Open Source Project + * Copyright (C) 2021 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import android.hardware.fingerprint.Fingerprint; /** * Communication channel for FingerprintManager to register the FingerprintStateListener - * in FingerprintService + * in FingerprintService. * @hide */ oneway interface IFingerprintStateListener { |