commit d94f93086b6a1237e609ab34ef1cf60afb0c5408
author Sailesh Nepal <sail@google.com> Thu Aug 25 22:49:39 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 25 22:49:39 2016 +0000
tree 5bdbe7d56dcbbea30563ea352f703f0043209e71
parent 82abca0fc70d9712d5eb8f645aeb8d3c47fb8993
parent de2562151a764168b8d96167605acb3aa1986583

Fix VoicemailChangePinActivity crash on dialog dismiss
am: de2562151a

Change-Id: I3547e68dbccc5f841c32406633b0736be5d9039e

src/com/android/phone/settings/VoicemailChangePinActivity.java

diff --git a/src/com/android/phone/settings/VoicemailChangePinActivity.java b/src/com/android/phone/settings/VoicemailChangePinActivity.java
index 74adb12..8027dc1 100644
--- a/src/com/android/phone/settings/VoicemailChangePinActivity.java
+++ b/src/com/android/phone/settings/VoicemailChangePinActivity.java
@@ -629,7 +629,12 @@
 
         private void sendResult(@ChangePinResult int result) {
             VvmLog.i(TAG, "Change PIN result: " + result);
-            mProgressDialog.dismiss();
+            if (mProgressDialog.isShowing() && !VoicemailChangePinActivity.this.isDestroyed() &&
+                    !VoicemailChangePinActivity.this.isFinishing()) {
+                mProgressDialog.dismiss();
+            } else {
+                VvmLog.i(TAG, "Dialog not visible, not dismissing");
+            }
             mHandler.obtainMessage(MESSAGE_HANDLE_RESULT, result, 0).sendToTarget();
             releaseNetwork();
         }