Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Deprecate all inner classes of FingerprintManager"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-26 17:34:07 +00:00
committed by Android (Google) Code Review
parent f157b9f983 0b16b3422d
commit f42a1080d5
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/current.txt
View File

@@ -16582,7 +16582,7 @@ package android.hardware.fingerprint {
field public static final int FINGERPRINT_ERROR_VENDOR = 8; // 0x8
}
public static abstract class FingerprintManager.AuthenticationCallback {
public static abstract deprecated class FingerprintManager.AuthenticationCallback {
ctor public FingerprintManager.AuthenticationCallback();
method public void onAuthenticationError(int, java.lang.CharSequence);
method public void onAuthenticationFailed();
@@ -16590,11 +16590,11 @@ package android.hardware.fingerprint {
method public void onAuthenticationSucceeded(android.hardware.fingerprint.FingerprintManager.AuthenticationResult);
}
public static class FingerprintManager.AuthenticationResult {
public static deprecated class FingerprintManager.AuthenticationResult {
method public android.hardware.fingerprint.FingerprintManager.CryptoObject getCryptoObject();
}
public static final class FingerprintManager.CryptoObject {
public static final deprecated class FingerprintManager.CryptoObject {
ctor public FingerprintManager.CryptoObject(java.security.Signature);
ctor public FingerprintManager.CryptoObject(javax.crypto.Cipher);
ctor public FingerprintManager.CryptoObject(javax.crypto.Mac);

6
core/java/android/hardware/fingerprint/FingerprintManager.java
View File

@@ -108,7 +108,9 @@ public class FingerprintManager implements BiometricFingerprintConstants {
/**
* A wrapper class for the crypto objects supported by FingerprintManager. Currently the
* framework supports {@link Signature}, {@link Cipher} and {@link Mac} objects.
* @deprecated See {@link android.hardware.fingerprint.FingerprintDialog.CryptoObject}
*/
@Deprecated
public static final class CryptoObject extends android.hardware.biometrics.CryptoObject {
public CryptoObject(@NonNull Signature signature) {
super(signature);
@@ -150,7 +152,9 @@ public class FingerprintManager implements BiometricFingerprintConstants {
/**
* Container for callback data from {@link FingerprintManager#authenticate(CryptoObject,
* CancellationSignal, int, AuthenticationCallback, Handler)}.
* @deprecated See {@link android.hardware.fingerprint.FingerprintDialog.AuthenticationResult}
*/
@Deprecated
public static class AuthenticationResult {
private Fingerprint mFingerprint;
private CryptoObject mCryptoObject;
@@ -197,7 +201,9 @@ public class FingerprintManager implements BiometricFingerprintConstants {
* FingerprintManager#authenticate(CryptoObject, CancellationSignal,
* int, AuthenticationCallback, Handler) } must provide an implementation of this for listening to
* fingerprint events.
* @deprecated See {@link android.hardware.fingerprint.FingerprintDialog.AuthenticationCallback}
*/
@Deprecated
public static abstract class AuthenticationCallback
extends BiometricAuthenticator.AuthenticationCallback {
/**