Merge "Deprecate all inner classes of FingerprintManager" (f42a1080) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);

core/java/android/hardware/fingerprint/FingerprintManager.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -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 {
		/**