summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-12-16 19:14:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-16 19:14:27 +0000
commitf9681cb40e76e1f1f3fb5c5018d0e1fee203e950 (patch)
treeef713eb963df46a82b443bb630c04084343d801b
parent5bfeebac81861dbba0a502170aed67a2ed1d4a45 (diff)
parent0a7d8edcd8b2a2972f19f38e6f92bfe7186353d4 (diff)
am 0a7d8edc: am 96989716: am 7594d78c: Merge "Check for cases before clearing dialog." into lmp-mr1-dev
* commit '0a7d8edcd8b2a2972f19f38e6f92bfe7186353d4': Check for cases before clearing dialog.
-rw-r--r--src/com/android/dialer/calllog/ClearCallLogDialog.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/dialer/calllog/ClearCallLogDialog.java b/src/com/android/dialer/calllog/ClearCallLogDialog.java
index e6b4ce29c..f4c75d10d 100644
--- a/src/com/android/dialer/calllog/ClearCallLogDialog.java
+++ b/src/com/android/dialer/calllog/ClearCallLogDialog.java
@@ -67,7 +67,13 @@ public class ClearCallLogDialog extends DialogFragment {
}
@Override
protected void onPostExecute(Void result) {
- progressDialog.dismiss();
+ if (getActivity() == null || getActivity().isDestroyed()) {
+ return;
+ }
+
+ if (progressDialog != null && progressDialog.isShowing()) {
+ progressDialog.dismiss();
+ }
}
};
// TODO: Once we have the API, we should configure this ProgressDialog