diff --git a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
index 1203e11f93c..ab8f18a201e 100644
--- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
+++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
@@ -22,7 +22,6 @@ import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.graphics.drawable.Drawable;
 import android.os.storage.StorageManager;
 import android.text.BidiFormatter;
@@ -77,22 +76,6 @@ public class AccessibilityServiceWarning {
         return ad;
     }
 
-    public static Dialog createDisableDialog(Activity parentActivity,
-            AccessibilityServiceInfo info, DialogInterface.OnClickListener listener) {
-        final AlertDialog ad = new AlertDialog.Builder(parentActivity)
-                .setTitle(parentActivity.getString(R.string.disable_service_title,
-                        info.getResolveInfo().loadLabel(parentActivity.getPackageManager())))
-                .setMessage(parentActivity.getString(R.string.disable_service_message,
-                        parentActivity.getString(R.string.accessibility_dialog_button_stop),
-                        getServiceName(parentActivity, info)))
-                .setCancelable(true)
-                .setPositiveButton(R.string.accessibility_dialog_button_stop, listener)
-                .setNegativeButton(R.string.accessibility_dialog_button_cancel, listener)
-                .create();
-
-        return ad;
-    }
-
     /**
      * Return whether the device is encrypted with legacy full disk encryption. Newer devices
      * should be using File Based Encryption.
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index e54446f0b69..837f1dc2ec9 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -60,9 +60,8 @@ import java.util.List;
 public class ToggleAccessibilityServicePreferenceFragment extends ToggleFeaturePreferenceFragment {
 
     private static final int DIALOG_ID_ENABLE_WARNING = 1;
-    private static final int DIALOG_ID_DISABLE_WARNING = 2;
-    private static final int DIALOG_ID_LAUNCH_ACCESSIBILITY_TUTORIAL = 3;
-    private static final int DIALOG_ID_EDIT_SHORTCUT = 4;
+    private static final int DIALOG_ID_LAUNCH_ACCESSIBILITY_TUTORIAL = 2;
+    private static final int DIALOG_ID_EDIT_SHORTCUT = 3;
 
     public static final int ACTIVITY_REQUEST_CONFIRM_CREDENTIAL_FOR_WEAKER_ENCRYPTION = 1;
 
@@ -121,20 +120,6 @@ public class ToggleAccessibilityServicePreferenceFragment extends ToggleFeatureP
                 mDialog.dismiss();
             };
 
-    private final DialogInterface.OnClickListener mDialogInterfaceOnClickListener =
-            (DialogInterface dialog, int which) -> {
-                switch (which) {
-                    case DialogInterface.BUTTON_POSITIVE:
-                        handleConfirmServiceEnabled(false);
-                        break;
-                    case DialogInterface.BUTTON_NEGATIVE:
-                        handleConfirmServiceEnabled(true);
-                        break;
-                    default:
-                        throw new IllegalArgumentException();
-                }
-            };
-
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.ACCESSIBILITY_SERVICE;
@@ -210,15 +195,6 @@ public class ToggleAccessibilityServicePreferenceFragment extends ToggleFeatureP
                         .createCapabilitiesDialog(getActivity(), info, mViewOnClickListener);
                 break;
             }
-            case DIALOG_ID_DISABLE_WARNING: {
-                AccessibilityServiceInfo info = getAccessibilityServiceInfo();
-                if (info == null) {
-                    return null;
-                }
-                mDialog = AccessibilityServiceWarning
-                        .createDisableDialog(getActivity(), info, mDialogInterfaceOnClickListener);
-                break;
-            }
             case DIALOG_ID_LAUNCH_ACCESSIBILITY_TUTORIAL: {
                 if (isGestureNavigateEnabled()) {
                     mDialog = AccessibilityGestureNavigationTutorial
@@ -248,8 +224,6 @@ public class ToggleAccessibilityServicePreferenceFragment extends ToggleFeatureP
         switch (dialogId) {
             case DIALOG_ID_ENABLE_WARNING:
                 return SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_ENABLE;
-            case DIALOG_ID_DISABLE_WARNING:
-                return SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_DISABLE;
             case DIALOG_ID_LAUNCH_ACCESSIBILITY_TUTORIAL:
                 return isGestureNavigateEnabled()
                         ? SettingsEnums.DIALOG_TOGGLE_SCREEN_GESTURE_NAVIGATION
@@ -378,9 +352,7 @@ public class ToggleAccessibilityServicePreferenceFragment extends ToggleFeatureP
                     getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, false);
                     showDialog(DIALOG_ID_ENABLE_WARNING);
                 } else {
-                    mSwitchBar.setCheckedInternal(true);
-                    getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, true);
-                    showDialog(DIALOG_ID_DISABLE_WARNING);
+                    handleConfirmServiceEnabled(false);
                 }
                 return true;
             }