From 0a441b2f06559cadd300a01e9a60719a293fe739 Mon Sep 17 00:00:00 2001 From: Oriol Prieto Gasco Date: Tue, 30 Apr 2024 20:05:13 +0000 Subject: [PATCH] RESTRICT AUTOMERGE Set the container field of aconfig flags Test: printflags --format='{package}:{container}:' | grep "::" Bug: 312769710 Flag: NONE Change-Id: I4fc69f563ead7206ef48278be4fb4cbcfc9cb1f7 --- aconfig/Android.bp | 5 +++++ aconfig/accessibility/accessibility_flags.aconfig | 1 + aconfig/development/settings_core_flag_declarations.aconfig | 1 + .../factory_reset/factory_reset_flag_declarations.aconfig | 1 + .../media_drm/settings_mediadrm_flag_declarations.aconfig | 1 + .../settings_accessibility_flag_declarations_legacy.aconfig | 1 + .../settings_biometrics_framework_flag_declarations.aconfig | 1 + aconfig/settings_biometrics_integration_declarations.aconfig | 1 + aconfig/settings_bluetooth_declarations.aconfig | 1 + aconfig/settings_connecteddevice_flag_declarations.aconfig | 1 + aconfig/settings_development_flag_declarations.aconfig | 1 + aconfig/settings_experience_flag_declarations.aconfig | 1 + aconfig/settings_flag_declarations.aconfig | 1 + aconfig/settings_globalintl_flag_declarations.aconfig | 1 + aconfig/settings_notification_flag_declarations.aconfig | 1 + .../settings_onboarding_experience_flag_declarations.aconfig | 1 + aconfig/settings_panel_flag_declarations.aconfig | 1 + aconfig/settings_telephony_flag_declarations.aconfig | 1 + aconfig/settings_threadnetwork_flag_declarations.aconfig | 1 + .../settings_voice_activation_apps_flag_declarations.aconfig | 1 + 20 files changed, 24 insertions(+) diff --git a/aconfig/Android.bp b/aconfig/Android.bp index d14cc6f1367..301ca6caa0f 100644 --- a/aconfig/Android.bp +++ b/aconfig/Android.bp @@ -5,6 +5,7 @@ package { aconfig_declarations { name: "aconfig_settings_flags", package: "com.android.settings.flags", + container: "system", srcs: [ "*.aconfig", ], @@ -18,6 +19,7 @@ java_aconfig_library { aconfig_declarations { name: "factory_reset_flags", package: "com.android.settings.factory_reset", + container: "system", srcs: ["factory_reset/*.aconfig"], } @@ -29,6 +31,7 @@ java_aconfig_library { aconfig_declarations { name: "media_drm_flags", package: "com.android.settings.media_drm", + container: "system", srcs: ["media_drm/*.aconfig"], } @@ -40,6 +43,7 @@ java_aconfig_library { aconfig_declarations { name: "accessibility_flags", package: "com.android.settings.accessibility", + container: "system", srcs: ["accessibility/*.aconfig"], } @@ -51,6 +55,7 @@ java_aconfig_library { aconfig_declarations { name: "development_settings_flags", package: "com.android.settings.development", + container: "system", srcs: [ "development/**/*.aconfig" ], diff --git a/aconfig/accessibility/accessibility_flags.aconfig b/aconfig/accessibility/accessibility_flags.aconfig index 7f1f909812d..62f9c35bc1d 100644 --- a/aconfig/accessibility/accessibility_flags.aconfig +++ b/aconfig/accessibility/accessibility_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.settings.accessibility" +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 fdbafa7b5fd..fec67f6b782 100644 --- a/aconfig/development/settings_core_flag_declarations.aconfig +++ b/aconfig/development/settings_core_flag_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.settings.development" +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 2b1ce720003..7feebf54dcc 100644 --- a/aconfig/factory_reset/factory_reset_flag_declarations.aconfig +++ b/aconfig/factory_reset/factory_reset_flag_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.settings.factory_reset" +container: "system" flag { name: "enable_factory_reset_wizard" diff --git a/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig b/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig index 06d75f1e34c..4697a11db9c 100644 --- a/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig +++ b/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.settings.media_drm" +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 acdce961c1e..bf3eb088e0d 100644 --- a/aconfig/settings_accessibility_flag_declarations_legacy.aconfig +++ b/aconfig/settings_accessibility_flag_declarations_legacy.aconfig @@ -1,4 +1,5 @@ package: "com.android.settings.flags" +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 810f2deb095..e9f19bc4ff4 100644 --- a/aconfig/settings_biometrics_framework_flag_declarations.aconfig +++ b/aconfig/settings_biometrics_framework_flag_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.settings.flags" +container: "system" flag { name: "biometric_settings_provider" diff --git a/aconfig/settings_biometrics_integration_declarations.aconfig b/aconfig/settings_biometrics_integration_declarations.aconfig index bc437f296cf..ea3ac193587 100644 --- a/aconfig/settings_biometrics_integration_declarations.aconfig +++ b/aconfig/settings_biometrics_integration_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.settings.flags" +container: "system" flag { name: "sfps_enroll_refinement" diff --git a/aconfig/settings_bluetooth_declarations.aconfig b/aconfig/settings_bluetooth_declarations.aconfig index 841430907d3..4aadb9d55e3 100644 --- a/aconfig/settings_bluetooth_declarations.aconfig +++ b/aconfig/settings_bluetooth_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.settings.flags" +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 07aaecc93b0..7c3584f28f7 100644 --- a/aconfig/settings_connecteddevice_flag_declarations.aconfig +++ b/aconfig/settings_connecteddevice_flag_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.settings.flags" +container: "system" flag { name: "enable_subsequent_pair_settings_integration" diff --git a/aconfig/settings_development_flag_declarations.aconfig b/aconfig/settings_development_flag_declarations.aconfig index c23a38f3f62..081794e2723 100644 --- a/aconfig/settings_development_flag_declarations.aconfig +++ b/aconfig/settings_development_flag_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.settings.flags" +container: "system" # 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 7642734c424..e6cb924159a 100644 --- a/aconfig/settings_experience_flag_declarations.aconfig +++ b/aconfig/settings_experience_flag_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.settings.flags" +container: "system" flag { name: "new_apn_page_enabled" diff --git a/aconfig/settings_flag_declarations.aconfig b/aconfig/settings_flag_declarations.aconfig index 56c4b321cba..1336a7e938e 100644 --- a/aconfig/settings_flag_declarations.aconfig +++ b/aconfig/settings_flag_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.settings.flags" +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 68662d0b921..95202d36484 100644 --- a/aconfig/settings_globalintl_flag_declarations.aconfig +++ b/aconfig/settings_globalintl_flag_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.settings.flags" +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 f2bf1c87a1f..bdb65738827 100644 --- a/aconfig/settings_notification_flag_declarations.aconfig +++ b/aconfig/settings_notification_flag_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.settings.flags" +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 6fb5377dd1c..8d58d40a66c 100644 --- a/aconfig/settings_onboarding_experience_flag_declarations.aconfig +++ b/aconfig/settings_onboarding_experience_flag_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.settings.flags" +container: "system" flag { name: "enable_sound_backup" diff --git a/aconfig/settings_panel_flag_declarations.aconfig b/aconfig/settings_panel_flag_declarations.aconfig index 10eb655f20c..efab83e5547 100644 --- a/aconfig/settings_panel_flag_declarations.aconfig +++ b/aconfig/settings_panel_flag_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.settings.flags" +container: "system" flag { name: "enable_volume_plus_quick_settings" diff --git a/aconfig/settings_telephony_flag_declarations.aconfig b/aconfig/settings_telephony_flag_declarations.aconfig index 0999a7b9ab9..dab1b45b548 100644 --- a/aconfig/settings_telephony_flag_declarations.aconfig +++ b/aconfig/settings_telephony_flag_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.settings.flags" +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 70945d34775..e5448a91eb4 100644 --- a/aconfig/settings_threadnetwork_flag_declarations.aconfig +++ b/aconfig/settings_threadnetwork_flag_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.settings.flags" +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 d98bc524002..a18e8c5a5b5 100644 --- a/aconfig/settings_voice_activation_apps_flag_declarations.aconfig +++ b/aconfig/settings_voice_activation_apps_flag_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.settings.flags" +container: "system" flag { name: "enable_voice_activation_apps_in_settings"