0916e7ca44aba5e6c89d75007da805697fdace9e - platform/frameworks/base

commit	0916e7ca44aba5e6c89d75007da805697fdace9e	[log] [tgz]
author	Dmitry Dementyev <dementyev@google.com>	Tue Jan 23 13:02:08 2018 -0800
committer	Dmitry Dementyev <dementyev@google.com>	Tue Jan 23 14:24:50 2018 -0800
tree	f723c350bf2cdc0adbe8f8991ad908f4d27cc3c0
parent	d51fdf01052ef0b4bed81fb086872fe26f7cf337 [diff]

Prepare KeyStore RecoveryController API for review.

- set/get recovery status simplification
- adding account to WrappedKey
- moving recovery methods to the Session class.

There are small cosmetical changes to .aidl which don't affect
implementation logic.

Bug: 72299798
Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I9efaa4cde42cf778bb97ed13f62750a65d8c6cb5

core/java/android/security/keystore/BackwardsCompat.java[diff]
core/java/android/security/keystore/recovery/DecryptionFailedException.java[diff]
core/java/android/security/keystore/recovery/InternalRecoveryServiceException.java[diff]
core/java/android/security/keystore/recovery/KeyChainProtectionParams.aidl[Renamed from core/java/android/security/keystore/recovery/KeychainProtectionParams.aidl - diff]
core/java/android/security/keystore/recovery/KeyChainProtectionParams.java[Renamed from core/java/android/security/keystore/recovery/KeychainProtectionParams.java - diff]
core/java/android/security/keystore/recovery/KeyChainSnapshot.aidl[Renamed from core/java/android/security/keystore/recovery/KeychainSnapshot.aidl - diff]
core/java/android/security/keystore/recovery/KeyChainSnapshot.java[Renamed from core/java/android/security/keystore/recovery/KeychainSnapshot.java - diff]
core/java/android/security/keystore/recovery/KeyDerivationParams.java[diff]
core/java/android/security/keystore/recovery/LockScreenRequiredException.java[diff]
core/java/android/security/keystore/recovery/RecoveryController.java[diff]
core/java/android/security/keystore/recovery/RecoverySession.java[diff]
core/java/android/security/keystore/recovery/SessionExpiredException.java[diff]
core/java/android/security/keystore/recovery/WrappedApplicationKey.java[diff]
core/java/com/android/internal/widget/ILockSettings.aidl[diff]
services/core/java/com/android/server/locksettings/LockSettingsService.java[diff]
services/core/java/com/android/server/locksettings/recoverablekeystore/KeySyncTask.java[diff]
services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java[diff]
services/core/java/com/android/server/locksettings/recoverablekeystore/storage/RecoverableKeyStoreDb.java[diff]
services/core/java/com/android/server/locksettings/recoverablekeystore/storage/RecoverySnapshotStorage.java[diff]
services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/KeySyncTaskTest.java[diff]
services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManagerTest.java[diff]
services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/storage/RecoverySnapshotStorageTest.java[diff]

22 files changed

tree: f723c350bf2cdc0adbe8f8991ad908f4d27cc3c0