commit e4310ea096748f88e7fb3765aad51ad84b1815a6
author Sunny Shao <sunnyshao@google.com> Wed Jun 26 04:43:25 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jun 26 04:43:25 2019 -0700
tree d23e72096d9b0f0e8ba28daf576c3ba2ab057442
parent dd3a072ce6255c970fd4f563282df652dc2954e4
parent bfffb2ae740909bfec45fe1c865249d14bd454f3

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

Change-Id: I51cbaf932b7dac50a2fd246d47f3fb69cd421c27

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