diff options
author | Andrew Lee <anwlee@google.com> | 2014-12-16 19:07:40 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-16 19:07:40 +0000 |
commit | 0a7d8edcd8b2a2972f19f38e6f92bfe7186353d4 (patch) | |
tree | 5ff4aacf5eb51b42ffa0a2d8eb7ec1c6e2ed6808 | |
parent | aa986c9157bb098846bb84cc30b68e0e7e5d77fa (diff) | |
parent | 96989716c8df956b8d550eaf767f49d27cf17f46 (diff) |
am 96989716: am 7594d78c: Merge "Check for cases before clearing dialog." into lmp-mr1-dev
* commit '96989716c8df956b8d550eaf767f49d27cf17f46':
Check for cases before clearing dialog.
-rw-r--r-- | src/com/android/dialer/calllog/ClearCallLogDialog.java | 8 |
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 |