From 6e1b274f03cab386f39c7d7c0b0487b4dcad6af3 Mon Sep 17 00:00:00 2001 From: Dennis Shen Date: Mon, 9 Sep 2024 20:00:45 +0000 Subject: [PATCH] Replace system_ext container with system Bug: b/365135457 Test: m Flag: EXEMPT refactor Change-Id: I574c5971e93172b3919b5676f917761d77aa0841 --- aconfig/Android.bp | 12 ++++++------ aconfig/accessibility/accessibility_flags.aconfig | 2 +- .../settings_core_flag_declarations.aconfig | 2 +- .../factory_reset_flag_declarations.aconfig | 2 +- .../settings_physical_keyboard_a11y_features.aconfig | 2 +- .../settings_mediadrm_flag_declarations.aconfig | 2 +- ...gs_accessibility_flag_declarations_legacy.aconfig | 2 +- ...gs_biometrics_framework_flag_declarations.aconfig | 2 +- ...tings_biometrics_integration_declarations.aconfig | 2 +- aconfig/settings_bluetooth_declarations.aconfig | 2 +- ...ettings_connecteddevice_flag_declarations.aconfig | 2 +- aconfig/settings_datetime_flag_declarations.aconfig | 2 +- .../settings_development_flag_declarations.aconfig | 2 +- .../settings_device_diagnostics_declarations.aconfig | 2 +- aconfig/settings_display_flag_declarations.aconfig | 2 +- .../settings_experience_flag_declarations.aconfig | 2 +- aconfig/settings_flag_declarations.aconfig | 2 +- .../settings_globalintl_flag_declarations.aconfig | 2 +- .../settings_notification_flag_declarations.aconfig | 2 +- ...s_onboarding_experience_flag_declarations.aconfig | 2 +- ...gs_perform_backup_tasks_flag_declarations.aconfig | 2 +- aconfig/settings_security_flag_declarations.aconfig | 2 +- aconfig/settings_telephony_flag_declarations.aconfig | 2 +- .../settings_threadnetwork_flag_declarations.aconfig | 2 +- ...s_voice_activation_apps_flag_declarations.aconfig | 2 +- aconfig/settings_wifi_flag_declarations.aconfig | 2 +- 26 files changed, 31 insertions(+), 31 deletions(-) diff --git a/aconfig/Android.bp b/aconfig/Android.bp index 198c24d3c48..c1afd6a2476 100644 --- a/aconfig/Android.bp +++ b/aconfig/Android.bp @@ -6,7 +6,7 @@ package { aconfig_declarations { name: "aconfig_settings_flags", package: "com.android.settings.flags", - container: "system_ext", + container: "system", srcs: [ "*.aconfig", ], @@ -20,7 +20,7 @@ java_aconfig_library { aconfig_declarations { name: "factory_reset_flags", package: "com.android.settings.factory_reset", - container: "system_ext", + container: "system", srcs: ["factory_reset/*.aconfig"], } @@ -32,7 +32,7 @@ java_aconfig_library { aconfig_declarations { name: "media_drm_flags", package: "com.android.settings.media_drm", - container: "system_ext", + container: "system", srcs: ["media_drm/*.aconfig"], } @@ -44,7 +44,7 @@ java_aconfig_library { aconfig_declarations { name: "accessibility_flags", package: "com.android.settings.accessibility", - container: "system_ext", + container: "system", srcs: ["accessibility/*.aconfig"], } @@ -56,7 +56,7 @@ java_aconfig_library { aconfig_declarations { name: "development_settings_flags", package: "com.android.settings.development", - container: "system_ext", + container: "system", srcs: [ "development/**/*.aconfig", ], @@ -70,7 +70,7 @@ java_aconfig_library { aconfig_declarations { name: "keyboard_flags", package: "com.android.settings.keyboard", - container: "system_ext", + container: "system", srcs: ["keyboard/*.aconfig"], } diff --git a/aconfig/accessibility/accessibility_flags.aconfig b/aconfig/accessibility/accessibility_flags.aconfig index 1871172fc5a..4a741a1884f 100644 --- a/aconfig/accessibility/accessibility_flags.aconfig +++ b/aconfig/accessibility/accessibility_flags.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.accessibility" -container: "system_ext" +container: "system" # NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors. diff --git a/aconfig/development/settings_core_flag_declarations.aconfig b/aconfig/development/settings_core_flag_declarations.aconfig index 8a6b055a55c..fec67f6b782 100644 --- a/aconfig/development/settings_core_flag_declarations.aconfig +++ b/aconfig/development/settings_core_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.development" -container: "system_ext" +container: "system" flag { name: "a2dp_offload_codec_extensibility_settings" diff --git a/aconfig/factory_reset/factory_reset_flag_declarations.aconfig b/aconfig/factory_reset/factory_reset_flag_declarations.aconfig index dc7d8d4e42a..7feebf54dcc 100644 --- a/aconfig/factory_reset/factory_reset_flag_declarations.aconfig +++ b/aconfig/factory_reset/factory_reset_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.factory_reset" -container: "system_ext" +container: "system" flag { name: "enable_factory_reset_wizard" diff --git a/aconfig/keyboard/settings_physical_keyboard_a11y_features.aconfig b/aconfig/keyboard/settings_physical_keyboard_a11y_features.aconfig index ca5cb8d7739..00c0b183759 100644 --- a/aconfig/keyboard/settings_physical_keyboard_a11y_features.aconfig +++ b/aconfig/keyboard/settings_physical_keyboard_a11y_features.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.keyboard" -container: "system_ext" +container: "system" flag { name: "keyboard_and_touchpad_a11y_new_page_enabled" diff --git a/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig b/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig index 10579ebd3dd..3969b2919de 100644 --- a/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig +++ b/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.media_drm" -container: "system_ext" +container: "system" flag { name: "force_l3_enabled" diff --git a/aconfig/settings_accessibility_flag_declarations_legacy.aconfig b/aconfig/settings_accessibility_flag_declarations_legacy.aconfig index d0e5850ddc3..6e02bfe20eb 100644 --- a/aconfig/settings_accessibility_flag_declarations_legacy.aconfig +++ b/aconfig/settings_accessibility_flag_declarations_legacy.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" # NOTE: Don't add new accessibility flags here, since the package name doesn't follow # the best practice for setting's feature flag go/settings-trunk-stable diff --git a/aconfig/settings_biometrics_framework_flag_declarations.aconfig b/aconfig/settings_biometrics_framework_flag_declarations.aconfig index e81c68e6aa0..820786eec68 100644 --- a/aconfig/settings_biometrics_framework_flag_declarations.aconfig +++ b/aconfig/settings_biometrics_framework_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" flag { name: "biometric_settings_provider" diff --git a/aconfig/settings_biometrics_integration_declarations.aconfig b/aconfig/settings_biometrics_integration_declarations.aconfig index 66d794b9d70..ea3ac193587 100644 --- a/aconfig/settings_biometrics_integration_declarations.aconfig +++ b/aconfig/settings_biometrics_integration_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" flag { name: "sfps_enroll_refinement" diff --git a/aconfig/settings_bluetooth_declarations.aconfig b/aconfig/settings_bluetooth_declarations.aconfig index 0c423b5a1b7..835a6378a6b 100644 --- a/aconfig/settings_bluetooth_declarations.aconfig +++ b/aconfig/settings_bluetooth_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" flag { name: "enable_offload_bluetooth_operations_to_background_thread" diff --git a/aconfig/settings_connecteddevice_flag_declarations.aconfig b/aconfig/settings_connecteddevice_flag_declarations.aconfig index ee0c233614f..872026027b1 100644 --- a/aconfig/settings_connecteddevice_flag_declarations.aconfig +++ b/aconfig/settings_connecteddevice_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" flag { name: "rotation_connected_display_setting" diff --git a/aconfig/settings_datetime_flag_declarations.aconfig b/aconfig/settings_datetime_flag_declarations.aconfig index dc3f1f409a6..3d9d8b317a5 100644 --- a/aconfig/settings_datetime_flag_declarations.aconfig +++ b/aconfig/settings_datetime_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" flag { name: "datetime_feedback" diff --git a/aconfig/settings_development_flag_declarations.aconfig b/aconfig/settings_development_flag_declarations.aconfig index b9a084f3a29..318f862eff8 100644 --- a/aconfig/settings_development_flag_declarations.aconfig +++ b/aconfig/settings_development_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" # NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors. diff --git a/aconfig/settings_device_diagnostics_declarations.aconfig b/aconfig/settings_device_diagnostics_declarations.aconfig index 90a12dbb9ab..7423f2bc00a 100644 --- a/aconfig/settings_device_diagnostics_declarations.aconfig +++ b/aconfig/settings_device_diagnostics_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" flag { name: "enable_device_diagnostics_in_settings" diff --git a/aconfig/settings_display_flag_declarations.aconfig b/aconfig/settings_display_flag_declarations.aconfig index 52b9603e051..9fe587b0162 100644 --- a/aconfig/settings_display_flag_declarations.aconfig +++ b/aconfig/settings_display_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" flag { name: "protect_screen_timeout_with_auth" diff --git a/aconfig/settings_experience_flag_declarations.aconfig b/aconfig/settings_experience_flag_declarations.aconfig index d5caccfbb5c..17d0059608c 100644 --- a/aconfig/settings_experience_flag_declarations.aconfig +++ b/aconfig/settings_experience_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" flag { name: "new_apn_page_enabled" diff --git a/aconfig/settings_flag_declarations.aconfig b/aconfig/settings_flag_declarations.aconfig index 983d4b3e6d9..b8cb4d9bcdf 100644 --- a/aconfig/settings_flag_declarations.aconfig +++ b/aconfig/settings_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" flag { name: "show_factory_reset_cancel_button" diff --git a/aconfig/settings_globalintl_flag_declarations.aconfig b/aconfig/settings_globalintl_flag_declarations.aconfig index 2f046d0026b..12a61294864 100644 --- a/aconfig/settings_globalintl_flag_declarations.aconfig +++ b/aconfig/settings_globalintl_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" flag { name: "terms_of_address_enabled" diff --git a/aconfig/settings_notification_flag_declarations.aconfig b/aconfig/settings_notification_flag_declarations.aconfig index f2ef4287f41..bdb65738827 100644 --- a/aconfig/settings_notification_flag_declarations.aconfig +++ b/aconfig/settings_notification_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" flag { name: "dedupe_dnd_settings_channels" diff --git a/aconfig/settings_onboarding_experience_flag_declarations.aconfig b/aconfig/settings_onboarding_experience_flag_declarations.aconfig index 830c1017741..8d58d40a66c 100644 --- a/aconfig/settings_onboarding_experience_flag_declarations.aconfig +++ b/aconfig/settings_onboarding_experience_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" flag { name: "enable_sound_backup" diff --git a/aconfig/settings_perform_backup_tasks_flag_declarations.aconfig b/aconfig/settings_perform_backup_tasks_flag_declarations.aconfig index dcb876b52f7..86bae9d84ad 100644 --- a/aconfig/settings_perform_backup_tasks_flag_declarations.aconfig +++ b/aconfig/settings_perform_backup_tasks_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" flag { name: "enable_perform_backup_tasks_in_settings" diff --git a/aconfig/settings_security_flag_declarations.aconfig b/aconfig/settings_security_flag_declarations.aconfig index e27f835aea8..3684212f87c 100644 --- a/aconfig/settings_security_flag_declarations.aconfig +++ b/aconfig/settings_security_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" flag { name: "protect_lock_after_timeout_with_auth" diff --git a/aconfig/settings_telephony_flag_declarations.aconfig b/aconfig/settings_telephony_flag_declarations.aconfig index c12de7ac340..dab1b45b548 100644 --- a/aconfig/settings_telephony_flag_declarations.aconfig +++ b/aconfig/settings_telephony_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" flag { name: "remove_key_hide_enable_2g" diff --git a/aconfig/settings_threadnetwork_flag_declarations.aconfig b/aconfig/settings_threadnetwork_flag_declarations.aconfig index 99664678137..e5448a91eb4 100644 --- a/aconfig/settings_threadnetwork_flag_declarations.aconfig +++ b/aconfig/settings_threadnetwork_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" flag { name: "thread_settings_enabled" diff --git a/aconfig/settings_voice_activation_apps_flag_declarations.aconfig b/aconfig/settings_voice_activation_apps_flag_declarations.aconfig index 9ca3525b1e5..d72e67fb687 100644 --- a/aconfig/settings_voice_activation_apps_flag_declarations.aconfig +++ b/aconfig/settings_voice_activation_apps_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" flag { name: "enable_voice_activation_apps_in_settings" diff --git a/aconfig/settings_wifi_flag_declarations.aconfig b/aconfig/settings_wifi_flag_declarations.aconfig index cb8007f2e93..67ed9437a9a 100644 --- a/aconfig/settings_wifi_flag_declarations.aconfig +++ b/aconfig/settings_wifi_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system_ext" +container: "system" # NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.