am 9767612c: Merge change If764d20a into eclair

Merge commit '9767612cc8207f906173dc9459b45cd07d881c4e'

* commit '9767612cc8207f906173dc9459b45cd07d881c4e':
  SecuritySettings: fix a the status before handling the intent.
This commit is contained in:
Chia-chi Yeh
2009-10-12 11:17:22 -07:00
committed by Android Git Automerger

View File

@@ -353,7 +353,7 @@ public class SecuritySettings extends PreferenceActivity {
private static final int RESET_DIALOG = 3; private static final int RESET_DIALOG = 3;
private KeyStore mKeyStore = KeyStore.getInstance(); private KeyStore mKeyStore = KeyStore.getInstance();
private int mState; private int mState = mKeyStore.test();
private int mDialogId; private int mDialogId;
private boolean mSubmit; private boolean mSubmit;