commit f9681cb40e76e1f1f3fb5c5018d0e1fee203e950
author Andrew Lee <anwlee@google.com> Tue Dec 16 19:14:27 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 16 19:14:27 2014 +0000
tree ef713eb963df46a82b443bb630c04084343d801b
parent 5bfeebac81861dbba0a502170aed67a2ed1d4a45
parent 0a7d8edcd8b2a2972f19f38e6f92bfe7186353d4

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.

src/com/android/dialer/calllog/ClearCallLogDialog.java

diff --git a/src/com/android/dialer/calllog/ClearCallLogDialog.java b/src/com/android/dialer/calllog/ClearCallLogDialog.java
index e6b4ce2..f4c75d1 100644
--- a/src/com/android/dialer/calllog/ClearCallLogDialog.java
+++ b/src/com/android/dialer/calllog/ClearCallLogDialog.java
@@ -67,7 +67,13 @@
                     }
                     @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