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

Commit b4dbc50d authored by Daniel Norman's avatar Daniel Norman Committed by Android (Google) Code Review
Browse files

Merge "Cleanup flag "check_prebundled_is_preinstalled"" into main

parents 9808ee15 de0e5cdf

src/com/android/settings/accessibility/AccessibilitySettings.java

+2 −4
Original line number Diff line number Diff line
@@ -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);

        }



        final PreferenceCategory downloadedServicesCategory =

                mCategoryToPrefCategoryMap.get(CATEGORY_DOWNLOADED_SERVICES);

tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java

+0 −1
Original line number Diff line number Diff line
@@ -463,7 +463,6 @@ public class AccessibilitySettingsTest { 
    }



    @Test

    @EnableFlags(Flags.FLAG_CHECK_PREBUNDLED_IS_PREINSTALLED)

    public void testNonPreinstalledApp_IncludedInDownloadedCategory() {

        mShadowAccessibilityManager.setInstalledAccessibilityServiceList(

                List.of(getMockAccessibilityServiceInfo(