From de0e5cdff98428e0fabe95abe2e6a8f946a87446 Mon Sep 17 00:00:00 2001
From: Cam Bickel <cambickel@google.com>
Date: Fri, 22 Nov 2024 17:24:35 +0000
Subject: [PATCH] Cleanup flag "check_prebundled_is_preinstalled"

Bug: b/353888087
Test: atest AccessibilitySettingsTest
Flag: EXEMPT flag cleanup
Change-Id: Ia16cc83b1d499bac3845c7397ae1ac3e4c97ae91
---
 .../settings/accessibility/AccessibilitySettings.java       | 6 ++----
 .../settings/accessibility/AccessibilitySettingsTest.java   | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 801d3ee223c..34badfc626f 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -412,10 +412,8 @@ public class AccessibilitySettings extends DashboardFragment implements
         final List<RestrictedPreference> preferenceList = getInstalledAccessibilityPreferences(
                 getPrefContext(), installedShortcutList, installedServiceList);
 
-        if (Flags.checkPrebundledIsPreinstalled()) {
-            removeNonPreinstalledComponents(mPreBundledServiceComponentToCategoryMap,
-                    installedShortcutList, installedServiceList);
-        }
+        removeNonPreinstalledComponents(mPreBundledServiceComponentToCategoryMap,
+                installedShortcutList, installedServiceList);
 
         final PreferenceCategory downloadedServicesCategory =
                 mCategoryToPrefCategoryMap.get(CATEGORY_DOWNLOADED_SERVICES);
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index 36578a90e25..56384f446e8 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -463,7 +463,6 @@ public class AccessibilitySettingsTest {
     }
 
     @Test
-    @EnableFlags(Flags.FLAG_CHECK_PREBUNDLED_IS_PREINSTALLED)
     public void testNonPreinstalledApp_IncludedInDownloadedCategory() {
         mShadowAccessibilityManager.setInstalledAccessibilityServiceList(
                 List.of(getMockAccessibilityServiceInfo(