Merge "Catch crash in mobile network ProgressDialog"

2020-02-24 21:07:17 +00:00
parent 7c849787ee 9f74807e89
commit aaee4539c7
1 changed files with 5 additions and 1 deletions
--- a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
+++ b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
@@ -176,7 +176,11 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon

    private void dismissProgressBar() {
        if (mProgressDialog != null && mProgressDialog.isShowing()) {
-            mProgressDialog.dismiss();
+            try {
+                mProgressDialog.dismiss();
+            } catch (IllegalArgumentException e) {
+                // Ignore exception since the dialog will be gone anyway.
+            }
        }
    }