Cleanup flag "check_prebundled_is_preinstalled"

Bug: b/353888087
Test: atest AccessibilitySettingsTest
Flag: EXEMPT flag cleanup
Change-Id: Ia16cc83b1d499bac3845c7397ae1ac3e4c97ae91
This commit is contained in:
Cam Bickel
2024-11-22 17:24:35 +00:00
committed by Camden Bickel
parent bf47e4419d
commit de0e5cdff9
2 changed files with 2 additions and 5 deletions

View File

@@ -412,10 +412,8 @@ public class AccessibilitySettings extends DashboardFragment implements
final List<RestrictedPreference> preferenceList = getInstalledAccessibilityPreferences( final List<RestrictedPreference> preferenceList = getInstalledAccessibilityPreferences(
getPrefContext(), installedShortcutList, installedServiceList); getPrefContext(), installedShortcutList, installedServiceList);
if (Flags.checkPrebundledIsPreinstalled()) { removeNonPreinstalledComponents(mPreBundledServiceComponentToCategoryMap,
removeNonPreinstalledComponents(mPreBundledServiceComponentToCategoryMap, installedShortcutList, installedServiceList);
installedShortcutList, installedServiceList);
}
final PreferenceCategory downloadedServicesCategory = final PreferenceCategory downloadedServicesCategory =
mCategoryToPrefCategoryMap.get(CATEGORY_DOWNLOADED_SERVICES); mCategoryToPrefCategoryMap.get(CATEGORY_DOWNLOADED_SERVICES);

View File

@@ -463,7 +463,6 @@ public class AccessibilitySettingsTest {
} }
@Test @Test
@EnableFlags(Flags.FLAG_CHECK_PREBUNDLED_IS_PREINSTALLED)
public void testNonPreinstalledApp_IncludedInDownloadedCategory() { public void testNonPreinstalledApp_IncludedInDownloadedCategory() {
mShadowAccessibilityManager.setInstalledAccessibilityServiceList( mShadowAccessibilityManager.setInstalledAccessibilityServiceList(
List.of(getMockAccessibilityServiceInfo( List.of(getMockAccessibilityServiceInfo(