commit 5a69fac6945317629bf856519803f675ef34b8db
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 26 11:15:35 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 26 11:15:35 2019 +0000
tree c54ce1c9b870489dab95f2e86547f4703cdbdbe6
parent 3288037bd2e96a480091157bf2382bddd09e4c04
parent d7d4a7ce6d8da891552abbc78db1100e698341f8

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

src/com/android/settings/accounts/RemoveAccountPreferenceController.java

diff --git a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
index 1bc30d0..5c6e6bb 100644
--- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
+++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
@@ -191,7 +191,11 @@
             }
             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