am 06167cc3: am b0883cb3: Fix bugs in credential storage settings:

Merge commit '06167cc39569fde2a9bdbff859ff5358f2f90a0b'

* commit '06167cc39569fde2a9bdbff859ff5358f2f90a0b':
  Fix bugs in credential storage settings:

src/com/android/settings/SecuritySettings.java

@@ -231,6 +231,8 @@ public class SecuritySettings extends PreferenceActivity {
 
         mShowPassword.setChecked(Settings.System.getInt(getContentResolver(),
                 Settings.System.TEXT_SHOW_PASSWORD, 1) != 0);
+
+        mCstorHelper.resume();
     }
 
     @Override
@@ -362,7 +364,7 @@ public class SecuritySettings extends PreferenceActivity {
 
         private View mView;
         private int mDialogId;
-        private boolean mRetry = false;
+        private boolean mRetry;
         private CheckBoxPreference mAccessCheckBox;
         private Preference mResetButton;
 
@@ -383,6 +385,11 @@ public class SecuritySettings extends PreferenceActivity {
             }
         }
 
+        void resume() {
+            if (mExternalIntent != null) return;
+            updatePreferences(mKeyStore.test());
+        }
+
         private void updatePreferences(int state) {
             mAccessCheckBox.setEnabled(state != KeyStore.UNINITIALIZED);
             mAccessCheckBox.setChecked(state == KeyStore.NO_ERROR);
@@ -428,6 +435,7 @@ public class SecuritySettings extends PreferenceActivity {
 
         private void showCstorDialog(int dialogId) {
             mDialogId = dialogId;
+            mRetry = false;
             showDialog(dialogId);
         }
 
@@ -455,6 +463,7 @@ public class SecuritySettings extends PreferenceActivity {
                 showCstorDialog(mDialogId);
             } else {
                 removeDialog(mDialogId);
+                updatePreferences(mState); // may revert checkbox
 
                 if (mExternalIntent != null) {
                     finish();