Merge "Remove the aconfig namespace list" into main (76b78135) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/SettingsToPropertiesMapper.java

+2 −179

Original line number	Diff line number	Diff line
		@@ -133,181 +133,6 @@ public class SettingsToPropertiesMapper {
		NAMESPACE_TETHERING_U_OR_LATER_NATIVE
		};

		// All the aconfig flags under the listed DeviceConfig scopes will be synced to native level.
		// The list is sorted.
		@VisibleForTesting
		static final String[] sDeviceConfigAconfigScopes = new String[] {
		"tv_os",
		"aaos_carframework_triage",
		"aaos_performance_triage",
		"aaos_input_triage",
		"aaos_user_triage",
		"aaos_window_triage",
		"aaos_audio_triage",
		"aaos_power_triage",
		"aaos_storage_triage",
		"aaos_sdv",
		"aaos_vac_triage",
		"accessibility",
		"android_core_networking",
		"android_health_services",
		"android_sdk",
		"android_kernel",
		"aoc",
		"app_widgets",
		"arc_next",
		"art_cloud",
		"art_mainline",
		"art_performance",
		"attack_tools",
		"automotive_cast",
		"avic",
		"desktop_firmware",
		"biometrics",
		"biometrics_framework",
		"biometrics_integration",
		"bluetooth",
		"brownout_mitigation_audio",
		"brownout_mitigation_modem",
		"build",
		"camera_hal",
		"camera_platform",
		"car_framework",
		"car_perception",
		"car_security",
		"car_telemetry",
		"codec_fwk",
		"companion",
		"com_android_adbd",
		"content_protection",
		"context_hub",
		"core_experiments_team_internal",
		"core_graphics",
		"core_libraries",
		"crumpet",
		"dck_framework",
		"desktop_apps",
		"desktop_audio",
		"desktop_better_together",
		"desktop_bsp",
		"desktop_camera",
		"desktop_connectivity",
		"desktop_dev_experience",
		"desktop_display",
		"desktop_commercial",
		"desktop_firmware",
		"desktop_graphics",
		"desktop_hwsec",
		"desktop_input",
		"desktop_kernel",
		"desktop_ml",
		"desktop_networking",
		"desktop_serviceability",
		"desktop_oobe",
		"desktop_peripherals",
		"desktop_personalization",
		"desktop_pnp",
		"desktop_privacy",
		"desktop_release",
		"desktop_security",
		"desktop_stats",
		"desktop_sysui",
		"desktop_users_and_accounts",
		"desktop_video",
		"desktop_wifi",
		"devoptions_settings",
		"game",
		"gpu",
		"haptics",
		"hardware_backed_security_mainline",
		"input",
		"incremental",
		"llvm_and_toolchains",
		"lse_desktop_experience",
		"machine_learning",
		"mainline_modularization",
		"mainline_sdk",
		"make_pixel_haptics",
		"media_audio",
		"media_drm",
		"media_projection",
		"media_reliability",
		"media_solutions",
		"media_tv",
		"microxr",
		"nearby",
		"nfc",
		"pdf_viewer",
		"perfetto",
		"pixel_audio_android",
		"pixel_biometrics_face",
		"pixel_bluetooth",
		"pixel_connectivity_gps",
		"pixel_continuity",
		"pixel_display",
		"pixel_fingerprint",
		"pixel_gsc",
		"pixel_perf",
		"pixel_sensai",
		"pixel_sensors",
		"pixel_state_server",
		"pixel_system_sw_video",
		"pixel_video_sw",
		"pixel_vpn",
		"pixel_watch",
		"pixel_watch_debug_trace",
		"pixel_watch_watchfaces",
		"pixel_wifi",
		"platform_compat",
		"platform_security",
		"pmw",
		"power",
		"preload_safety",
		"printing",
		"privacy_infra_policy",
		"psap_ai",
		"ravenwood",
		"resource_manager",
		"responsible_apis",
		"rust",
		"safety_center",
		"sensors",
		"spoon",
		"stability",
		"statsd",
		"system_performance",
		"system_sw_battery",
		"system_sw_touch",
		"system_sw_usb",
		"test_suites",
		"text",
		"threadnetwork",
		"treble",
		"tv_os_media",
		"tv_system_ui",
		"usb",
		"vibrator",
		"virtual_devices",
		"virtualization",
		"wallet_integration",
		"wear_calling_messaging",
		"wear_connectivity",
		"wear_esim_carriers",
		"wear_frameworks",
		"wear_media",
		"wear_offload",
		"wear_security",
		"wear_system_health",
		"wear_systems",
		"wear_sysui",
		"wear_system_managed_surfaces",
		"wear_watchfaces",
		"web_apps_on_chromeos_and_android",
		"window_surfaces",
		"windowing_frontend",
		"xr",
		};

		public static final String NAMESPACE_REBOOT_STAGING = "staged";
		public static final String NAMESPACE_REBOOT_STAGING_DELIMITER = "*";

		@@ -322,8 +147,7 @@ public class SettingsToPropertiesMapper {
		@VisibleForTesting
		protected SettingsToPropertiesMapper(ContentResolver contentResolver,
		String[] globalSettings,
		String[] deviceConfigScopes,
		String[] deviceConfigAconfigScopes) {
		String[] deviceConfigScopes) {
		mContentResolver = contentResolver;
		mGlobalSettings = globalSettings;
		mDeviceConfigScopes = deviceConfigScopes;
		@@ -618,8 +442,7 @@ public class SettingsToPropertiesMapper {
		SettingsToPropertiesMapper mapper = new SettingsToPropertiesMapper(
		contentResolver,
		sGlobalSettings,
		sDeviceConfigScopes,
		sDeviceConfigAconfigScopes);
		sDeviceConfigScopes);
		mapper.updatePropertiesFromSettings();
		return mapper;
		}

services/tests/mockingservicestests/src/com/android/server/am/SettingsToPropertiesMapperTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ public class SettingsToPropertiesMapperTest {
		).when(() -> Settings.Global.getString(any(), anyString()));

		mTestMapper = new SettingsToPropertiesMapper(
		mMockContentResolver, TEST_MAPPING, new String[] {}, new String[] {});
		mMockContentResolver, TEST_MAPPING, new String[] {});
		}

		@After
		@@ -118,7 +118,7 @@ public class SettingsToPropertiesMapperTest {
		@Test
		public void testClearAconfigStorageOverride() {
		SettingsToPropertiesMapper spyMapper = Mockito.spy(new SettingsToPropertiesMapper(
		mMockContentResolver, TEST_MAPPING, new String[] {}, new String[] {}));
		mMockContentResolver, TEST_MAPPING, new String[] {}));
		HashMap flags = new HashMap();
		flags.put("test_package.test_flag", null);
		DeviceConfig.Properties props = new DeviceConfig.Properties("test_namespace", flags);