2bcdad95330c75e3122d0736f1a40acd521dc243 - platform/frameworks/base

commit	2bcdad95330c75e3122d0736f1a40acd521dc243	[log] [tgz]
author	Robert Berry <robertberry@google.com>	Thu Jan 18 12:53:29 2018 +0000
committer	Robert Berry <robertberry@google.com>	Thu Jan 18 14:36:32 2018 +0000
tree	9d714f11916da061cf9343f5392e8f5f1bf907d0
parent	e8ffec166131d27e47fbf21c9db9f6812051b15f [diff]

Use RecoverySession object to hide session IDs (redux)

Session IDs are an implementation detail that the framework can (and should)
abstract away. This was previously reverted due to breaking master.

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

Change-Id: I4427c818348c054ada39d799b6da3b739f27eba9

core/java/android/security/keystore/RecoveryClaim.java[Added - diff]
core/java/android/security/keystore/RecoveryManager.java[diff]
core/java/android/security/keystore/RecoverySession.java[Added - 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/RecoverableKeyStoreManager.java[diff]
services/core/java/com/android/server/locksettings/recoverablekeystore/storage/RecoverySessionStorage.java[diff]
services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManagerTest.java[diff]
services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/storage/RecoverySessionStorageTest.java[diff]

9 files changed

tree: 9d714f11916da061cf9343f5392e8f5f1bf907d0