From d9ec7f2b34e7085e09beedbd3b28f193dbf85000 Mon Sep 17 00:00:00 2001 From: Dennis Shen Date: Tue, 30 Apr 2024 22:06:28 +0000 Subject: [PATCH] fix container designation, it should be system_ext Cherry pick of internal aflag fix ag/27165141 Bug: b/338095619 Merged-In: I8ee2fd5fad529da2026af77f969abbf88e636ac3 Change-Id: Icea56b89944afd85b7760265ea8bfe35e3300f13 --- aconfig/Android.bp | 2 +- .../settings_accessibility_flag_declarations_legacy.aconfig | 2 +- .../settings_biometrics_framework_flag_declarations.aconfig | 2 +- aconfig/settings_biometrics_integration_declarations.aconfig | 2 +- aconfig/settings_bluetooth_declarations.aconfig | 2 +- aconfig/settings_connecteddevice_flag_declarations.aconfig | 2 +- aconfig/settings_development_flag_declarations.aconfig | 2 +- aconfig/settings_experience_flag_declarations.aconfig | 2 +- aconfig/settings_flag_declarations.aconfig | 2 +- aconfig/settings_globalintl_flag_declarations.aconfig | 2 +- aconfig/settings_notification_flag_declarations.aconfig | 2 +- .../settings_onboarding_experience_flag_declarations.aconfig | 2 +- aconfig/settings_panel_flag_declarations.aconfig | 2 +- aconfig/settings_telephony_flag_declarations.aconfig | 2 +- aconfig/settings_threadnetwork_flag_declarations.aconfig | 2 +- .../settings_voice_activation_apps_flag_declarations.aconfig | 4 ++-- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/aconfig/Android.bp b/aconfig/Android.bp index 301ca6caa0f..41c1818682e 100644 --- a/aconfig/Android.bp +++ b/aconfig/Android.bp @@ -5,7 +5,7 @@ package { aconfig_declarations { name: "aconfig_settings_flags", package: "com.android.settings.flags", - container: "system", + container: "system_ext", srcs: [ "*.aconfig", ], diff --git a/aconfig/settings_accessibility_flag_declarations_legacy.aconfig b/aconfig/settings_accessibility_flag_declarations_legacy.aconfig index bf3eb088e0d..cbf113b61cd 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 e9f19bc4ff4..2283f7695e8 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 4aadb9d55e3..ee5904b4bbb 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 7c3584f28f7..d0178183c00 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: "enable_subsequent_pair_settings_integration" diff --git a/aconfig/settings_development_flag_declarations.aconfig b/aconfig/settings_development_flag_declarations.aconfig index 081794e2723..5af4cfaa0db 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_experience_flag_declarations.aconfig b/aconfig/settings_experience_flag_declarations.aconfig index e6cb924159a..9fe3f327383 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 1336a7e938e..411aec55f96 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 95202d36484..48f3a2933d5 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_panel_flag_declarations.aconfig b/aconfig/settings_panel_flag_declarations.aconfig index efab83e5547..2ad5d3b8c9a 100644 --- a/aconfig/settings_panel_flag_declarations.aconfig +++ b/aconfig/settings_panel_flag_declarations.aconfig @@ -1,5 +1,5 @@ package: "com.android.settings.flags" -container: "system" +container: "system_ext" flag { name: "enable_volume_plus_quick_settings" 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 a18e8c5a5b5..9ca3525b1e5 100644 --- a/aconfig/settings_voice_activation_apps_flag_declarations.aconfig +++ b/aconfig/settings_voice_activation_apps_flag_declarations.aconfig @@ -1,9 +1,9 @@ package: "com.android.settings.flags" -container: "system" +container: "system_ext" flag { name: "enable_voice_activation_apps_in_settings" namespace: "permissions" description: "Enable voice activation apps in Settings" bug: "303727896" -} \ No newline at end of file +}