From: Brian Carlstrom <bdc@google.com>
Date: Thu, 2 Jun 2011 23:21:55 +0000 (-0700)
Subject: KeyStore.reset changes
X-Git-Tag: android-x86-4.4-r1~6986^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=804f499fda954080f69c0ae93512f129bb0cfaab;p=android-x86%2Fframeworks-native.git

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
---

diff --git a/cmds/keystore/keystore.cpp b/cmds/keystore/keystore.cpp
index 31db9fdc1c..b48be6ef38 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;