OSDN Git Service

Merge "Implement generateAndStoreKey"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 22 Dec 2017 19:10:24 +0000 (19:10 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 22 Dec 2017 19:10:24 +0000 (19:10 +0000)
commit14cddc465bcda7ba1ae2f97ada23c82a507abdf4
tree247a61f8ab805d596aa17dcea3ea37661a36d3ce
parent25f5d01738442db65904577a2b2d71853052130e
parentcfc990a49ddc00f3ca972b463c6475d7d5ac7b41
Merge "Implement generateAndStoreKey"
core/java/android/security/recoverablekeystore/RecoverableKeyStoreLoader.java
core/java/com/android/internal/widget/ILockSettings.aidl
services/core/java/com/android/server/locksettings/LockSettingsService.java
services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java
services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManagerTest.java