diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2015-05-08 21:51:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-08 21:51:25 +0000 |
| commit | f8a96d16290dbca1b1bdad153ceadad9c7d55111 (patch) | |
| tree | 870416db1b57bb959479bb654bd72e6e504a7c20 /core | |
| parent | db9629eec46a3259a9973c2d597fc0813028694c (diff) | |
| parent | a91a8504191d91d288c55821caa5bf00c9be26a2 (diff) | |
| download | frameworks_base-f8a96d16290dbca1b1bdad153ceadad9c7d55111.zip frameworks_base-f8a96d16290dbca1b1bdad153ceadad9c7d55111.tar.gz frameworks_base-f8a96d16290dbca1b1bdad153ceadad9c7d55111.tar.bz2 | |
Merge "Cleanup keystore password changing and unlocking" into mnc-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/security/IKeystoreService.aidl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/security/IKeystoreService.aidl b/core/java/android/security/IKeystoreService.aidl index 579cdbe..4809050 100644 --- a/core/java/android/security/IKeystoreService.aidl +++ b/core/java/android/security/IKeystoreService.aidl @@ -37,9 +37,9 @@ interface IKeystoreService { int exist(String name, int uid); String[] saw(String namePrefix, int uid); int reset(); - int password(String password); + int onUserPasswordChanged(int userId, String newPassword); int lock(); - int unlock(String password); + int unlock(int userId, String userPassword); int zero(); int generate(String name, int uid, int keyType, int keySize, int flags, in KeystoreArguments args); |