diff options
author | Jeff Sharkey <jsharkey@android.com> | 2013-11-04 16:36:01 -0800 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2013-11-04 17:15:09 -0800 |
commit | f02f519971544d74aa97640d19c6ca59a090c1a0 (patch) | |
tree | 5f1b4413387d038ff3515067ddd15000ac37b0b8 /src | |
parent | 5e5811371518566cae401191923f2715c1b84798 (diff) | |
download | android_packages_apps_KeyChain-f02f519971544d74aa97640d19c6ca59a090c1a0.tar.gz android_packages_apps_KeyChain-f02f519971544d74aa97640d19c6ca59a090c1a0.tar.bz2 android_packages_apps_KeyChain-f02f519971544d74aa97640d19c6ca59a090c1a0.zip |
Always show cert dialog after unlocked.
After the user has unlocked the credential store, we need to return
to State.INITIAL that results in always showing the chooser dialog
when resuming.
Bug: 11438552
Change-Id: I17703e786e20e9f7351d40557816db52d6b8920d
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/keychain/KeyChainActivity.java | 1 |
1 files changed, 1 insertions, 0 deletions
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 @@ public class KeyChainActivity extends Activity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { switch (requestCode) { case REQUEST_UNLOCK: + mState = State.INITIAL; if (mKeyStore.isUnlocked()) { showCertChooserDialog(); } else { |