am 66959341: Fix behavior of cancelling the name cred. dialog.

Merge commit '66959341a6b0891893d4c851be708c3073f61154'

* commit '66959341a6b0891893d4c851be708c3073f61154':
  Fix behavior of cancelling the name cred. dialog.
This commit is contained in:
Hung-ying Tyan
2009-07-09 12:49:23 -07:00
committed by The Android Open Source Project

View File

@@ -537,7 +537,12 @@ public class SecuritySettings extends PreferenceActivity implements
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
if (which == DialogInterface.BUTTON_NEGATIVE) { 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; return;
} }