From e0c046c187c1ce4d43035b2b57b2c442d74c72b9 Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Fri, 17 Jan 2025 12:32:05 +0900 Subject: [PATCH] Revert "Replace system_ext container with system" This reverts commit 6e1b274f03cab386f39c7d7c0b0487b4dcad6af3. A system partition cannot have the aconfigs of other partitions. Revive the system_ext container for system_ext aconfigs. Bug: 385213580 Test: "adb shell aflags list" must not be changed. Flag: EXEMPT refactor (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1337a88d112b005f897b3745b5475cf7d4764db7) Merged-In: I8f52d5f86e6ffaccd624846fbe1ba0a8fc842af6 Change-Id: I8f52d5f86e6ffaccd624846fbe1ba0a8fc842af6 --- aconfig/Android.bp | 12 ++++++------ aconfig/accessibility/accessibility_flags.aconfig | 2 +- aconfig/catalyst/about_phone.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 +- ...ontacts_default_account_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 +- 28 files changed, 33 insertions(+), 33 deletions(-) diff --git a/aconfig/Android.bp b/aconfig/Android.bp index 8be93f04c56..768db02f480 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", + container: "system_ext", srcs: [ "*.aconfig", "catalyst/*.aconfig", @@ -21,7 +21,7 @@ java_aconfig_library { aconfig_declarations { name: "factory_reset_flags", package: "com.android.settings.factory_reset", - container: "system", + container: "system_ext", srcs: ["factory_reset/*.aconfig"], } @@ -33,7 +33,7 @@ java_aconfig_library { aconfig_declarations { name: "media_drm_flags", package: "com.android.settings.media_drm", - container: "system", + container: "system_ext", srcs: ["media_drm/*.aconfig"], } @@ -45,7 +45,7 @@ java_aconfig_library { aconfig_declarations { name: "accessibility_flags", package: "com.android.settings.accessibility", - container: "system", + container: "system_ext", srcs: ["accessibility/*.aconfig"], } @@ -57,7 +57,7 @@ java_aconfig_library { aconfig_declarations { name: "development_settings_flags", package: "com.android.settings.development", - container: "system", + container: "system_ext", srcs: [ "development/**/*.aconfig", ], @@ -71,7 +71,7 @@ java_aconfig_library { aconfig_declarations { name: "keyboard_flags", package: "com.android.settings.keyboard", - container: "system", + container: "system_ext", srcs: ["keyboard/*.aconfig"], } diff --git a/aconfig/accessibility/accessibility_flags.aconfig b/aconfig/accessibility/accessibility_flags.aconfig index 4a741a1884f..1871172fc5a 100644 --- a/aconfig/accessibility/accessibility_flags.aconfig +++ b/aconfig/accessibility/accessibility_flags.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.accessibility" -container: "system" +container: "system_ext" # NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors. diff --git a/aconfig/catalyst/about_phone.aconfig b/aconfig/catalyst/about_phone.aconfig index 5403b652c6c..59a2228c38f 100644 --- a/aconfig/catalyst/about_phone.aconfig +++ b/aconfig/catalyst/about_phone.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system" +container: "system_ext" flag { name: "catalyst_legal_information" diff --git a/aconfig/development/settings_core_flag_declarations.aconfig b/aconfig/development/settings_core_flag_declarations.aconfig index b73b0268009..45768f461dc 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" +container: "system_ext" flag { name: "deprecate_list_activity" diff --git a/aconfig/factory_reset/factory_reset_flag_declarations.aconfig b/aconfig/factory_reset/factory_reset_flag_declarations.aconfig index 7feebf54dcc..dc7d8d4e42a 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" +container: "system_ext" 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 00c0b183759..ca5cb8d7739 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" +container: "system_ext" 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 3969b2919de..10579ebd3dd 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" +container: "system_ext" flag { name: "force_l3_enabled" diff --git a/aconfig/settings_accessibility_flag_declarations_legacy.aconfig b/aconfig/settings_accessibility_flag_declarations_legacy.aconfig index 6e02bfe20eb..d0e5850ddc3 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" +container: "system_ext" # 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 820786eec68..e81c68e6aa0 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" +container: "system_ext" flag { name: "biometric_settings_provider" diff --git a/aconfig/settings_biometrics_integration_declarations.aconfig b/aconfig/settings_biometrics_integration_declarations.aconfig index ea3ac193587..66d794b9d70 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" +container: "system_ext" flag { name: "sfps_enroll_refinement" diff --git a/aconfig/settings_bluetooth_declarations.aconfig b/aconfig/settings_bluetooth_declarations.aconfig index 835a6378a6b..0c423b5a1b7 100644 --- a/aconfig/settings_bluetooth_declarations.aconfig +++ b/aconfig/settings_bluetooth_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system" +container: "system_ext" 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 872026027b1..ee0c233614f 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" +container: "system_ext" flag { name: "rotation_connected_display_setting" diff --git a/aconfig/settings_contacts_default_account_flag_declarations.aconfig b/aconfig/settings_contacts_default_account_flag_declarations.aconfig index eb877af4ad9..621714d9830 100644 --- a/aconfig/settings_contacts_default_account_flag_declarations.aconfig +++ b/aconfig/settings_contacts_default_account_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system" +container: "system_ext" flag { name: "enable_contacts_default_account_in_settings" diff --git a/aconfig/settings_datetime_flag_declarations.aconfig b/aconfig/settings_datetime_flag_declarations.aconfig index 3d9d8b317a5..dc3f1f409a6 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" +container: "system_ext" flag { name: "datetime_feedback" diff --git a/aconfig/settings_development_flag_declarations.aconfig b/aconfig/settings_development_flag_declarations.aconfig index 318f862eff8..b9a084f3a29 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" +container: "system_ext" # 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 7423f2bc00a..90a12dbb9ab 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" +container: "system_ext" flag { name: "enable_device_diagnostics_in_settings" diff --git a/aconfig/settings_display_flag_declarations.aconfig b/aconfig/settings_display_flag_declarations.aconfig index 9fe587b0162..52b9603e051 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" +container: "system_ext" flag { name: "protect_screen_timeout_with_auth" diff --git a/aconfig/settings_experience_flag_declarations.aconfig b/aconfig/settings_experience_flag_declarations.aconfig index 17d0059608c..d5caccfbb5c 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" +container: "system_ext" flag { name: "new_apn_page_enabled" diff --git a/aconfig/settings_flag_declarations.aconfig b/aconfig/settings_flag_declarations.aconfig index a9c7bd59f23..37a8798d2a8 100644 --- a/aconfig/settings_flag_declarations.aconfig +++ b/aconfig/settings_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system" +container: "system_ext" flag { name: "show_factory_reset_cancel_button" diff --git a/aconfig/settings_globalintl_flag_declarations.aconfig b/aconfig/settings_globalintl_flag_declarations.aconfig index 12a61294864..2f046d0026b 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" +container: "system_ext" flag { name: "terms_of_address_enabled" diff --git a/aconfig/settings_notification_flag_declarations.aconfig b/aconfig/settings_notification_flag_declarations.aconfig index bdb65738827..f2ef4287f41 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" +container: "system_ext" 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 8d58d40a66c..830c1017741 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" +container: "system_ext" 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 86bae9d84ad..dcb876b52f7 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" +container: "system_ext" 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 3684212f87c..e27f835aea8 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" +container: "system_ext" 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 dab1b45b548..c12de7ac340 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" +container: "system_ext" flag { name: "remove_key_hide_enable_2g" diff --git a/aconfig/settings_threadnetwork_flag_declarations.aconfig b/aconfig/settings_threadnetwork_flag_declarations.aconfig index e5448a91eb4..99664678137 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" +container: "system_ext" 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 d72e67fb687..9ca3525b1e5 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" +container: "system_ext" 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 67ed9437a9a..cb8007f2e93 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" +container: "system_ext" # NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.