commit bfffb2ae740909bfec45fe1c865249d14bd454f3
author Sunny Shao <sunnyshao@google.com> Wed Jun 26 04:35:26 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jun 26 04:35:26 2019 -0700
tree f75b17bee16430187c53c25f42adc50258efcbf2
parent fb523688733aed29e2de568c49a134e800ba168a
parent 5a69fac6945317629bf856519803f675ef34b8db

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

Change-Id: I085502786e8883c7ffb346592bfebc1a3bb08209

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