summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2009-07-09 11:45:02 +0800
committerHung-ying Tyan <tyanh@google.com>2009-07-09 11:51:06 +0800
commit66959341a6b0891893d4c851be708c3073f61154 (patch)
treef6478c9c6e4999afe1a434d2c65c137202715bef /src/com
parent7063f37102a334798349d4672981e52cba9cc0bd (diff)
downloadpackages_apps_settings-66959341a6b0891893d4c851be708c3073f61154.zip
packages_apps_settings-66959341a6b0891893d4c851be708c3073f61154.tar.gz
packages_apps_settings-66959341a6b0891893d4c851be708c3073f61154.tar.bz2
Fix behavior of cancelling the name cred. dialog.
The code used to trying to store the credential even when the user cancels the dialog. Fixed in this CL.
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/settings/SecuritySettings.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 73578c7..79a3948 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -525,7 +525,12 @@ public class SecuritySettings extends PreferenceActivity implements
public void onClick(DialogInterface dialog, int which) {
if (which == DialogInterface.BUTTON_NEGATIVE) {
- if (mCstorAddCredentialHelper != null) finish();
+ if (mCstorAddCredentialHelper != null) {
+ // release the object here so that it doesn't get triggerred in
+ // onDismiss()
+ mCstorAddCredentialHelper = null;
+ finish();
+ }
return;
}