commit fa6c8019836284040fc8335eac257b8b1e68278e
author Jeff Sharkey <jsharkey@android.com> Tue Nov 05 10:22:41 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 05 10:22:41 2013 -0800
tree 353b4f83f56ed14a239ec6a5dee115753185d4ba
parent de2b3f249ed81bdd30e588b4abcdcf66492be217
parent f02f519971544d74aa97640d19c6ca59a090c1a0

am f02f5199: Always show cert dialog after unlocked.

* commit 'f02f519971544d74aa97640d19c6ca59a090c1a0':
  Always show cert dialog after unlocked.

src/com/android/keychain/KeyChainActivity.java

diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java
index e7b161b..822ae1a 100644
--- a/src/com/android/keychain/KeyChainActivity.java
+++ b/src/com/android/keychain/KeyChainActivity.java
@@ -356,6 +356,7 @@
     @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
             case REQUEST_UNLOCK:
+                mState = State.INITIAL;
                 if (mKeyStore.isUnlocked()) {
                     showCertChooserDialog();
                 } else {