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

Commit 56c54e4b authored by Jason Chiu's avatar Jason Chiu Committed by Automerger Merge Worker
Browse files

Merge "Do not show the redundant RemoveAccountFailureDialog" into sc-v2-dev am: 5377da37 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16413584

Change-Id: Ia3f4875855d0e722b178b6bd5cea391db6b4803c
parents ecb88bac 5377da37

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

+6 −4
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import java.io.IOException; 
public class RemoveAccountPreferenceController extends AbstractPreferenceController

        implements PreferenceControllerMixin, OnClickListener {



    private static final String TAG = "RemoveAccountPrefController";

    private static final String KEY_REMOVE_ACCOUNT = "remove_account";



    private final MetricsFeatureProvider mMetricsFeatureProvider;
@@ -175,10 +176,11 @@ public class RemoveAccountPreferenceController extends AbstractPreferenceControl 
                                | IOException

                                | AuthenticatorException e) {

                            // handled below

                        }

                        if (failed) {

                            Log.w(TAG, "Remove account error: " + e);

                            RemoveAccountFailureDialog.show(getTargetFragment());

                        } else {

                        }

                        Log.i(TAG, "failed: " + failed);

                        if (!failed) {

                            targetActivity.finish();

                        }

                    }, null, mUserHandle);
@@ -210,7 +212,7 @@ public class RemoveAccountPreferenceController extends AbstractPreferenceControl 
            final Context context = getActivity();



            return new AlertDialog.Builder(context)

                    .setTitle(R.string.really_remove_account_title)

                    .setTitle(R.string.remove_account_label)

                    .setMessage(R.string.remove_account_failed)

                    .setPositiveButton(android.R.string.ok, null)

                    .create();