Merge "Fixed the IllegalStateException on removing account" into qt-dev am: 5a69fac694

am: bfffb2ae74 Change-Id: Iac5fbc9c5486a7ea4db51bfc2cccc10cd8cd37e0
2019-06-26 04:43:25 -07:00
parent 8cfc709591 bfffb2ae74
commit 788093f3c8
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