Merge "Mark all old RecoveryController APIs as deprecated" (9ba8462a) · Commits · e / os / android_frameworks_base

core/java/android/security/keystore/BadCertificateFormatException.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -17,8 +17,7 @@
		package android.security.keystore;

		/**
		* Error thrown when the recovery agent supplies an invalid X509 certificate.
		*
		* @deprecated Use {@link android.security.keystore.recovery.BadCertificateFormatException}.
		* @hide
		*/
		public class BadCertificateFormatException extends RecoveryControllerException {

+1 −3

Original line number	Diff line number	Diff line
		@@ -17,9 +17,7 @@
		package android.security.keystore;

		/**
		* Error thrown when decryption failed, due to an agent error. i.e., using the incorrect key,
		* trying to decrypt garbage data, trying to decrypt data that has somehow been corrupted, etc.
		*
		* @deprecated Use {@link android.security.keystore.recovery.DecryptionFailedException}.
		* @hide
		*/
		public class DecryptionFailedException extends RecoveryControllerException {

+1 −5

Original line number	Diff line number	Diff line
		@@ -17,11 +17,7 @@
		package android.security.keystore;

		/**
		* An error thrown when something went wrong internally in the recovery service.
		*
		* <p>This is an unexpected error, and indicates a problem with the service itself, rather than the
		* caller having performed some kind of illegal action.
		*
		* @deprecated Use {@link android.security.keystore.recovery.InternalRecoveryServiceException}.
		* @hide
		*/
		public class InternalRecoveryServiceException extends RecoveryControllerException {

+1 −3

Original line number	Diff line number	Diff line
		@@ -27,9 +27,7 @@ import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;

		/**
		* Collection of parameters which define a key derivation function.
		* Currently only supports salted SHA-256
		*
		* @deprecated Use {@link android.security.keystore.recovery.KeyDerivationParams}.
		* @hide
		*/
		public final class KeyDerivationParams implements Parcelable {

+1 −17

Original line number	Diff line number	Diff line
		@@ -28,23 +28,7 @@ import java.lang.annotation.RetentionPolicy;
		import java.util.Arrays;

		/**
		* A {@link KeychainSnapshot} is protected with a key derived from the user's lock screen. This
		* class wraps all the data necessary to derive the same key on a recovering device:
		*
		* <ul>
		* <li>UI parameters for the user's lock screen - so that if e.g., the user was using a pattern,
		* the recovering device can display the pattern UI to the user when asking them to enter
		* the lock screen from their previous device.
		* <li>The algorithm used to derive a key from the user's lock screen, e.g. SHA-256 with a salt.
		* </ul>
		*
		* <p>As such, this data is sent along with the {@link KeychainSnapshot} when syncing the current
		* version of the keychain.
		*
		* <p>For now, the recoverable keychain only supports a single layer of protection, which is the
		* user's lock screen. In the future, the keychain will support multiple layers of protection
		* (e.g. an additional keychain password, along with the lock screen).
		*
		* @deprecated Use {@link android.security.keystore.recovery.KeyChainProtectionParams}.
		* @hide
		*/
		public final class KeychainProtectionParams implements Parcelable {