PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cleanup flag "check_prebundled_is_preinstalled"" into main

Browse Source
This commit is contained in:
Daniel Norman
2024-11-25 20:45:50 +00:00
committed by Android (Google) Code Review
parent 9808ee15bd de0e5cdff9
commit b4dbc50d6a
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/accessibility/AccessibilitySettings.java
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);

1
tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
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(