Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d843ee85 authored by Sunny Shao's avatar Sunny Shao
Browse files

Fixed the IllegalStateException on removing account 

According the log, I found that there are a lot of DeadObjectException and gms servervice restart.
The system became unstable during this period, so add try/catch to avoid the exception of the Settings.

Fixes: 133253227
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.accounts
      make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.core
      make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.dashboard

Change-Id: I8534e8f7118234f6346607415698f9f91c3e5ffb
parent c28ceeb7

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -191,7 +191,11 @@ public class RemoveAccountPreferenceController extends AbstractPreferenceControl 
            }

            }

            final RemoveAccountFailureDialog dialog = new RemoveAccountFailureDialog();

            final RemoveAccountFailureDialog dialog = new RemoveAccountFailureDialog();

            dialog.setTargetFragment(parent, 0);

            dialog.setTargetFragment(parent, 0);

            try {

                dialog.show(parent.getFragmentManager(), FAILED_REMOVAL_DIALOG);

                dialog.show(parent.getFragmentManager(), FAILED_REMOVAL_DIALOG);

            } catch (IllegalStateException e) {

                Log.w(TAG, "Can't show RemoveAccountFailureDialog. " +  e.getMessage());

            }

        }

        }





        @Override

        @Override