Merge "Delete unimplemented APIs from RecoveryController." into pi-dev (0ed26bc8) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −3

Original line number	Diff line number	Diff line
		@@ -4318,7 +4318,6 @@ package android.security.keystore.recovery {
		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
		@@ -4373,7 +4372,6 @@ package android.security.keystore.recovery {
		method public static android.security.keystore.recovery.RecoveryController getInstance(android.content.Context);
		method public java.security.Key getKey(java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException, java.security.UnrecoverableKeyException;
		method public android.security.keystore.recovery.KeyChainSnapshot getKeyChainSnapshot() throws android.security.keystore.recovery.InternalRecoveryServiceException;
		method public int[] getPendingRecoverySecretTypes() throws android.security.keystore.recovery.InternalRecoveryServiceException;
		method public deprecated android.security.keystore.recovery.KeyChainSnapshot getRecoveryData() throws android.security.keystore.recovery.InternalRecoveryServiceException;
		method public int[] getRecoverySecretTypes() throws android.security.keystore.recovery.InternalRecoveryServiceException;
		method public deprecated int getRecoveryStatus(java.lang.String, java.lang.String) throws android.security.keystore.recovery.InternalRecoveryServiceException;
		@@ -4382,7 +4380,6 @@ package android.security.keystore.recovery {
		method public java.security.Key importKey(java.lang.String, byte[]) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.security.keystore.recovery.LockScreenRequiredException;
		method public deprecated void initRecoveryService(java.lang.String, byte[]) throws java.security.cert.CertificateException, android.security.keystore.recovery.InternalRecoveryServiceException;
		method public void initRecoveryService(java.lang.String, byte[], 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 deprecated void setRecoveryStatus(java.lang.String, java.lang.String, int) throws android.security.keystore.recovery.InternalRecoveryServiceException, android.content.pm.PackageManager.NameNotFoundException;

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

+1 −8

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ import java.util.Arrays;
		public final class KeyChainProtectionParams implements Parcelable {
		/** @hide */
		@Retention(RetentionPolicy.SOURCE)
		@IntDef(prefix = {"TYPE_"}, value = {TYPE_LOCKSCREEN, TYPE_CUSTOM_PASSWORD})
		@IntDef(prefix = {"TYPE_"}, value = {TYPE_LOCKSCREEN})
		public @interface UserSecretType {
		}

		@@ -61,11 +61,6 @@ public final class KeyChainProtectionParams implements Parcelable {
		*/
		public static final int TYPE_LOCKSCREEN = 100;

		/**
		* Custom passphrase, unrelated to lock screen, is required to recover KeyStore.
		*/
		public static final int TYPE_CUSTOM_PASSWORD = 101;

		/** @hide */
		@Retention(RetentionPolicy.SOURCE)
		@IntDef(prefix = {"UI_FORMAT_"}, value = {UI_FORMAT_PIN, UI_FORMAT_PASSWORD, UI_FORMAT_PATTERN})
		@@ -120,7 +115,6 @@ public final class KeyChainProtectionParams implements Parcelable {

		/**
		* @see TYPE_LOCKSCREEN
		* @see TYPE_CUSTOM_PASSWORD
		*/
		public @UserSecretType int getUserSecretType() {
		return mUserSecretType;
		@@ -166,7 +160,6 @@ public final class KeyChainProtectionParams implements Parcelable {
		* Sets user secret type.
		*
		* @see TYPE_LOCKSCREEN
		* @see TYPE_CUSTOM_PASSWORD
		* @param userSecretType The secret type
		* @return This builder.
		*/

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

+1 −47

Original line number	Diff line number	Diff line
		@@ -410,8 +410,7 @@ public class RecoveryController {
		* Specifies a set of secret types used for end-to-end keystore encryption. Knowing all of them
		* is necessary to recover data.
		*
		* @param secretTypes {@link KeyChainProtectionParams#TYPE_LOCKSCREEN} or {@link
		* KeyChainProtectionParams#TYPE_CUSTOM_PASSWORD}
		* @param secretTypes {@link KeyChainProtectionParams#TYPE_LOCKSCREEN}
		* @throws InternalRecoveryServiceException if an unexpected error occurred in the recovery
		* service.
		*/
		@@ -449,51 +448,6 @@ public class RecoveryController {
		}
		}

		/**
		* Returns a list of recovery secret types, necessary to create a pending recovery snapshot.
		* When user enters a secret of a pending type {@link #recoverySecretAvailable} should be
		* called.
		*
		* @return list of recovery secret types
		* @throws InternalRecoveryServiceException if an unexpected error occurred in the recovery
		* service.
		*/
		@NonNull
		@RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)
		public @KeyChainProtectionParams.UserSecretType int[] getPendingRecoverySecretTypes()
		throws InternalRecoveryServiceException {
		try {
		return mBinder.getPendingRecoverySecretTypes();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		} catch (ServiceSpecificException e) {
		throw wrapUnexpectedServiceSpecificException(e);
		}
		}

		/**
		* Method notifies KeyStore that a user-generated secret is available. This method generates a
		* symmetric session key which a trusted remote device can use to return a recovery key. Caller
		* should use {@link KeyChainProtectionParams#clearSecret} to override the secret value in
		* memory.
		*
		* @param recoverySecret user generated secret together with parameters necessary to regenerate
		* it on a new device.
		* @throws InternalRecoveryServiceException if an unexpected error occurred in the recovery
		* service.
		*/
		@RequiresPermission(android.Manifest.permission.RECOVER_KEYSTORE)
		public void recoverySecretAvailable(@NonNull KeyChainProtectionParams recoverySecret)
		throws InternalRecoveryServiceException {
		try {
		mBinder.recoverySecretAvailable(recoverySecret);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		} catch (ServiceSpecificException e) {
		throw wrapUnexpectedServiceSpecificException(e);
		}
		}

		/**
		* Deprecated.
		* Generates a AES256/GCM/NoPADDING key called {@code alias} and loads it into the recoverable

core/java/com/android/internal/widget/ILockSettings.aidl

+0 −1

Original line number	Diff line number	Diff line
		@@ -74,7 +74,6 @@ interface ILockSettings {
		void setRecoverySecretTypes(in int[] secretTypes);
		int[] getRecoverySecretTypes();
		int[] getPendingRecoverySecretTypes();
		void recoverySecretAvailable(in KeyChainProtectionParams recoverySecret);
		byte[] startRecoverySession(in String sessionId,
		in byte[] verifierPublicKey, in byte[] vaultParams, in byte[] vaultChallenge,
		in List<KeyChainProtectionParams> secrets);

services/core/java/com/android/server/locksettings/LockSettingsService.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -2034,12 +2034,6 @@ public class LockSettingsService extends ILockSettings.Stub {
		throw new SecurityException("Not implemented");
		}

		@Override
		public void recoverySecretAvailable(@NonNull KeyChainProtectionParams recoverySecret)
		throws RemoteException {
		mRecoverableKeyStoreManager.recoverySecretAvailable(recoverySecret);
		}

		@Override
		public byte[] startRecoverySession(@NonNull String sessionId,
		@NonNull byte[] verifierPublicKey, @NonNull byte[] vaultParams,