diff options
author | Brian Carlstrom <bdc@google.com> | 2011-06-02 16:21:55 -0700 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2011-06-02 16:24:45 -0700 |
commit | 804f499fda954080f69c0ae93512f129bb0cfaab (patch) | |
tree | 1e0d1bb289853294e4b3fe09d98b069ee8830af5 /cmds | |
parent | 4173e4e251bafe10de318317394219af30a019df (diff) | |
download | frameworks_native-804f499fda954080f69c0ae93512f129bb0cfaab.zip frameworks_native-804f499fda954080f69c0ae93512f129bb0cfaab.tar.gz frameworks_native-804f499fda954080f69c0ae93512f129bb0cfaab.tar.bz2 |
KeyStore.reset changes
restore keystore reset behavior of removing master key.
otherwise after reboot keystore has is LOCKED and not UNINITIALIZED
cmds/keystore/keystore.cpp
when removing password, reset the keystore, so it doesn't remain
locked with a now bogus password.
core/java/com/android/internal/widget/LockPatternUtils.java
Change-Id: If5e0bb50b42599e9ca27a8b91d6cec12528419a1
Diffstat (limited to 'cmds')
-rw-r--r-- | cmds/keystore/keystore.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cmds/keystore/keystore.cpp b/cmds/keystore/keystore.cpp index 31db9fd..b48be6e 100644 --- a/cmds/keystore/keystore.cpp +++ b/cmds/keystore/keystore.cpp @@ -392,9 +392,7 @@ public: return false; } while ((file = readdir(dir)) != NULL) { - if (isKeyFile(file->d_name)) { - unlink(file->d_name); - } + unlink(file->d_name); } closedir(dir); return true; |