Merge "Unhide RecoverableKeyStoreLoader API." (8df0200e) · Commits · e / os / android_frameworks_base

api/current.txt

+9 −9

Original line number	Diff line number	Diff line
		@@ -11545,15 +11545,15 @@ package android.content.res {

		public final class AssetManager implements java.lang.AutoCloseable {
		method public void close();
		method public java.lang.String[] getLocales();
		method public java.lang.String[] list(java.lang.String) throws java.io.IOException;
		method public java.io.InputStream open(java.lang.String) throws java.io.IOException;
		method public java.io.InputStream open(java.lang.String, int) throws java.io.IOException;
		method public android.content.res.AssetFileDescriptor openFd(java.lang.String) throws java.io.IOException;
		method public android.content.res.AssetFileDescriptor openNonAssetFd(java.lang.String) throws java.io.IOException;
		method public android.content.res.AssetFileDescriptor openNonAssetFd(int, java.lang.String) throws java.io.IOException;
		method public android.content.res.XmlResourceParser openXmlResourceParser(java.lang.String) throws java.io.IOException;
		method public android.content.res.XmlResourceParser openXmlResourceParser(int, java.lang.String) throws java.io.IOException;
		method public final java.lang.String[] getLocales();
		method public final java.lang.String[] list(java.lang.String) throws java.io.IOException;
		method public final java.io.InputStream open(java.lang.String) throws java.io.IOException;
		method public final java.io.InputStream open(java.lang.String, int) throws java.io.IOException;
		method public final android.content.res.AssetFileDescriptor openFd(java.lang.String) throws java.io.IOException;
		method public final android.content.res.AssetFileDescriptor openNonAssetFd(java.lang.String) throws java.io.IOException;
		method public final android.content.res.AssetFileDescriptor openNonAssetFd(int, java.lang.String) throws java.io.IOException;
		method public final android.content.res.XmlResourceParser openXmlResourceParser(java.lang.String) throws java.io.IOException;
		method public final android.content.res.XmlResourceParser openXmlResourceParser(int, java.lang.String) throws java.io.IOException;
		field public static final int ACCESS_BUFFER = 3; // 0x3
		field public static final int ACCESS_RANDOM = 1; // 0x1
		field public static final int ACCESS_STREAMING = 2; // 0x2

api/system-current.txt

+114 −0

Original line number	Diff line number	Diff line
		@@ -3903,6 +3903,120 @@ package android.security.keystore {

		}

		package android.security.keystore.recovery {

		public class DecryptionFailedException extends java.security.GeneralSecurityException {
		ctor public DecryptionFailedException(java.lang.String);
		}

		public class InternalRecoveryServiceException extends java.security.GeneralSecurityException {
		ctor public InternalRecoveryServiceException(java.lang.String);
		ctor public InternalRecoveryServiceException(java.lang.String, java.lang.Throwable);
		}

		public final class KeyChainProtectionParams implements android.os.Parcelable {
		method public void clearSecret();
		method public int describeContents();
		method public android.security.keystore.recovery.KeyDerivationParams getKeyDerivationParams();
		method public int getLockScreenUiFormat();
		method public byte[] getSecret();
		method public int getUserSecretType();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.security.keystore.recovery.KeyChainProtectionParams> CREATOR;
		field public static final int TYPE_CUSTOM_PASSWORD = 101; // 0x65
		field public static final int TYPE_LOCKSCREEN = 100; // 0x64
		field public static final int UI_FORMAT_PASSWORD = 2; // 0x2
		field public static final int UI_FORMAT_PATTERN = 3; // 0x3
		field public static final int UI_FORMAT_PIN = 1; // 0x1
		}

		public static class KeyChainProtectionParams.Builder {
		ctor public KeyChainProtectionParams.Builder();
		method public android.security.keystore.recovery.KeyChainProtectionParams build();
		method public android.security.keystore.recovery.KeyChainProtectionParams.Builder setKeyDerivationParams(android.security.keystore.recovery.KeyDerivationParams);
		method public android.security.keystore.recovery.KeyChainProtectionParams.Builder setLockScreenUiFormat(int);
		method public android.security.keystore.recovery.KeyChainProtectionParams.Builder setSecret(byte[]);
		method public android.security.keystore.recovery.KeyChainProtectionParams.Builder setUserSecretType(int);
		}

		public final class KeyChainSnapshot implements android.os.Parcelable {
		method public int describeContents();
		method public long getCounterId();
		method public byte[] getEncryptedRecoveryKeyBlob();
		method public java.util.List<android.security.keystore.recovery.KeyChainProtectionParams> getKeyChainProtectionParams();
		method public int getMaxAttempts();
		method public byte[] getServerParams();
		method public int getSnapshotVersion();
		method public byte[] getTrustedHardwarePublicKey();
		method public java.util.List<android.security.keystore.recovery.WrappedApplicationKey> getWrappedApplicationKeys();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.security.keystore.recovery.KeyChainSnapshot> CREATOR;
		}

		public final class KeyDerivationParams implements android.os.Parcelable {
		method public static android.security.keystore.recovery.KeyDerivationParams createSha256Params(byte[]);
		method public int describeContents();
		method public int getAlgorithm();
		method public byte[] getSalt();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final int ALGORITHM_SHA256 = 1; // 0x1
		field public static final android.os.Parcelable.Creator<android.security.keystore.recovery.KeyDerivationParams> CREATOR;
		}

		public class LockScreenRequiredException extends java.security.GeneralSecurityException {
		ctor public LockScreenRequiredException(java.lang.String);
		}

		public class RecoveryController {
		method public byte[] generateAndStoreKey(java.lang.String, byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.LockScreenRequiredException;
		method public java.util.List<java.lang.String> getAliases(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;
		method public static android.security.keystore.recovery.RecoveryController getInstance(android.content.Context);
		method public int[] getPendingRecoverySecretTypes() throws android.security.keystore.recovery.InternalRecoveryServiceException;
		method public android.security.keystore.recovery.KeyChainSnapshot getRecoveryData() throws android.security.keystore.recovery.InternalRecoveryServiceException;
		method public int[] getRecoverySecretTypes() throws android.security.keystore.recovery.InternalRecoveryServiceException;
		method public int getRecoveryStatus(java.lang.String, java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;
		method public void initRecoveryService(java.lang.String, byte[]) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;
		method public void recoverySecretAvailable(android.security.keystore.recovery.KeyChainProtectionParams) throws android.security.keystore.recovery.InternalRecoveryServiceException;
		method public void removeKey(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;
		method public void setRecoverySecretTypes(int[]) throws android.security.keystore.recovery.InternalRecoveryServiceException;
		method public void setRecoveryStatus(java.lang.String, java.lang.String, int) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.content.pm.PackageManager.NameNotFoundException;
		method public void setServerParams(byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException;
		method public void setSnapshotCreatedPendingIntent(android.app.PendingIntent) throws android.security.keystore.recovery.InternalRecoveryServiceException;
		field public static final int RECOVERY_STATUS_MISSING_ACCOUNT = 2; // 0x2
		field public static final int RECOVERY_STATUS_PERMANENT_FAILURE = 3; // 0x3
		field public static final int RECOVERY_STATUS_SYNCED = 0; // 0x0
		field public static final int RECOVERY_STATUS_SYNC_IN_PROGRESS = 1; // 0x1
		}

		public class RecoverySession implements java.lang.AutoCloseable {
		method public void close();
		method public java.util.Map<java.lang.String, byte[]> recoverKeys(byte[], java.util.List<android.security.keystore.recovery.WrappedApplicationKey>) throws android.security.keystore.recovery.DecryptionFailedException, android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.SessionExpiredException;
		method public byte[] start(byte[], byte[], byte[], java.util.List<android.security.keystore.recovery.KeyChainProtectionParams>) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;
		}

		public class SessionExpiredException extends java.security.GeneralSecurityException {
		ctor public SessionExpiredException(java.lang.String);
		}

		public final class WrappedApplicationKey implements android.os.Parcelable {
		method public int describeContents();
		method public byte[] getAccount();
		method public java.lang.String getAlias();
		method public byte[] getEncryptedKeyMaterial();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.security.keystore.recovery.WrappedApplicationKey> CREATOR;
		}

		public static class WrappedApplicationKey.Builder {
		ctor public WrappedApplicationKey.Builder();
		method public android.security.keystore.recovery.WrappedApplicationKey build();
		method public android.security.keystore.recovery.WrappedApplicationKey.Builder setAccount(byte[]);
		method public android.security.keystore.recovery.WrappedApplicationKey.Builder setAlias(java.lang.String);
		method public android.security.keystore.recovery.WrappedApplicationKey.Builder setEncryptedKeyMaterial(byte[]);
		}

		}

		package android.service.autofill {

		public abstract class AutofillFieldClassificationService extends android.app.Service {

core/java/android/security/keystore/KeychainProtectionParams.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -260,9 +260,6 @@ public final class KeychainProtectionParams implements Parcelable {
		}
		};

		/**
		* @hide
		*/
		@Override
		public void writeToParcel(Parcel out, int flags) {
		out.writeInt(mUserSecretType);

core/java/android/security/keystore/KeychainSnapshot.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -151,6 +151,8 @@ public final class KeychainSnapshot implements Parcelable {

		/**
		* Builder for creating {@link KeychainSnapshot}.
		*
		* @hide
		*/
		public static class Builder {
		private KeychainSnapshot mInstance = new KeychainSnapshot();
		@@ -263,9 +265,6 @@ public final class KeychainSnapshot implements Parcelable {
		}
		}

		/**
		* @hide
		*/
		@Override
		public void writeToParcel(Parcel out, int flags) {
		out.writeInt(mSnapshotVersion);

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ package android.security.keystore.recovery;
		* Error thrown when the recovery agent supplies an invalid X509 certificate.
		*
		* @hide
		* Deprecated
		*/
		public class BadCertificateFormatException extends RecoveryControllerException {
		public BadCertificateFormatException(String msg) {