Merge "Fixed the IllegalStateException on removing account" into qt-dev

am: 5a69fac694 Change-Id: I6d87742bd0925237cb73171561118e4bdd363b8a
2019-06-26 04:35:26 -07:00
parent e4e1f08781 5a69fac694
commit 27067657f2
1 changed files with 5 additions and 1 deletions
--- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
+++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
@@ -191,7 +191,11 @@ public class RemoveAccountPreferenceController extends AbstractPreferenceControl
            }
            final RemoveAccountFailureDialog dialog = new RemoveAccountFailureDialog();
            dialog.setTargetFragment(parent, 0);
-            dialog.show(parent.getFragmentManager(), FAILED_REMOVAL_DIALOG);
+            try {
+                dialog.show(parent.getFragmentManager(), FAILED_REMOVAL_DIALOG);
+            } catch (IllegalStateException e) {
+                Log.w(TAG, "Can't show RemoveAccountFailureDialog. " +  e.getMessage());
+            }
        }

        @Override