RESTRICT AUTOMERGE

Set the container field of aconfig flags

Test: printflags --format='{package}:{container}:' | grep "::"
Bug: 312769710
Flag: NONE
Change-Id: I4fc69f563ead7206ef48278be4fb4cbcfc9cb1f7
This commit is contained in:
Oriol Prieto Gasco
2024-04-30 20:05:13 +00:00
committed by Oriol Prieto Gascó
parent 8c85f8b3c3
commit 0a441b2f06
20 changed files with 24 additions and 0 deletions

View File

@@ -5,6 +5,7 @@ package {
aconfig_declarations { aconfig_declarations {
name: "aconfig_settings_flags", name: "aconfig_settings_flags",
package: "com.android.settings.flags", package: "com.android.settings.flags",
container: "system",
srcs: [ srcs: [
"*.aconfig", "*.aconfig",
], ],
@@ -18,6 +19,7 @@ java_aconfig_library {
aconfig_declarations { aconfig_declarations {
name: "factory_reset_flags", name: "factory_reset_flags",
package: "com.android.settings.factory_reset", package: "com.android.settings.factory_reset",
container: "system",
srcs: ["factory_reset/*.aconfig"], srcs: ["factory_reset/*.aconfig"],
} }
@@ -29,6 +31,7 @@ java_aconfig_library {
aconfig_declarations { aconfig_declarations {
name: "media_drm_flags", name: "media_drm_flags",
package: "com.android.settings.media_drm", package: "com.android.settings.media_drm",
container: "system",
srcs: ["media_drm/*.aconfig"], srcs: ["media_drm/*.aconfig"],
} }
@@ -40,6 +43,7 @@ java_aconfig_library {
aconfig_declarations { aconfig_declarations {
name: "accessibility_flags", name: "accessibility_flags",
package: "com.android.settings.accessibility", package: "com.android.settings.accessibility",
container: "system",
srcs: ["accessibility/*.aconfig"], srcs: ["accessibility/*.aconfig"],
} }
@@ -51,6 +55,7 @@ java_aconfig_library {
aconfig_declarations { aconfig_declarations {
name: "development_settings_flags", name: "development_settings_flags",
package: "com.android.settings.development", package: "com.android.settings.development",
container: "system",
srcs: [ srcs: [
"development/**/*.aconfig" "development/**/*.aconfig"
], ],

View File

@@ -1,4 +1,5 @@
package: "com.android.settings.accessibility" package: "com.android.settings.accessibility"
container: "system"
# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors. # NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.

View File

@@ -1,4 +1,5 @@
package: "com.android.settings.development" package: "com.android.settings.development"
container: "system"
flag { flag {
name: "a2dp_offload_codec_extensibility_settings" name: "a2dp_offload_codec_extensibility_settings"

View File

@@ -1,4 +1,5 @@
package: "com.android.settings.factory_reset" package: "com.android.settings.factory_reset"
container: "system"
flag { flag {
name: "enable_factory_reset_wizard" name: "enable_factory_reset_wizard"

View File

@@ -1,4 +1,5 @@
package: "com.android.settings.media_drm" package: "com.android.settings.media_drm"
container: "system"
flag { flag {
name: "force_l3_enabled" name: "force_l3_enabled"

View File

@@ -1,4 +1,5 @@
package: "com.android.settings.flags" package: "com.android.settings.flags"
container: "system"
# NOTE: Don't add new accessibility flags here, since the package name doesn't follow # 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 # the best practice for setting's feature flag go/settings-trunk-stable

View File

@@ -1,4 +1,5 @@
package: "com.android.settings.flags" package: "com.android.settings.flags"
container: "system"
flag { flag {
name: "biometric_settings_provider" name: "biometric_settings_provider"

View File

@@ -1,4 +1,5 @@
package: "com.android.settings.flags" package: "com.android.settings.flags"
container: "system"
flag { flag {
name: "sfps_enroll_refinement" name: "sfps_enroll_refinement"

View File

@@ -1,4 +1,5 @@
package: "com.android.settings.flags" package: "com.android.settings.flags"
container: "system"
flag { flag {
name: "enable_offload_bluetooth_operations_to_background_thread" name: "enable_offload_bluetooth_operations_to_background_thread"

View File

@@ -1,4 +1,5 @@
package: "com.android.settings.flags" package: "com.android.settings.flags"
container: "system"
flag { flag {
name: "enable_subsequent_pair_settings_integration" name: "enable_subsequent_pair_settings_integration"

View File

@@ -1,4 +1,5 @@
package: "com.android.settings.flags" package: "com.android.settings.flags"
container: "system"
# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors. # NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.

View File

@@ -1,4 +1,5 @@
package: "com.android.settings.flags" package: "com.android.settings.flags"
container: "system"
flag { flag {
name: "new_apn_page_enabled" name: "new_apn_page_enabled"

View File

@@ -1,4 +1,5 @@
package: "com.android.settings.flags" package: "com.android.settings.flags"
container: "system"
flag { flag {
name: "show_factory_reset_cancel_button" name: "show_factory_reset_cancel_button"

View File

@@ -1,4 +1,5 @@
package: "com.android.settings.flags" package: "com.android.settings.flags"
container: "system"
flag { flag {
name: "terms_of_address_enabled" name: "terms_of_address_enabled"

View File

@@ -1,4 +1,5 @@
package: "com.android.settings.flags" package: "com.android.settings.flags"
container: "system"
flag { flag {
name: "dedupe_dnd_settings_channels" name: "dedupe_dnd_settings_channels"

View File

@@ -1,4 +1,5 @@
package: "com.android.settings.flags" package: "com.android.settings.flags"
container: "system"
flag { flag {
name: "enable_sound_backup" name: "enable_sound_backup"

View File

@@ -1,4 +1,5 @@
package: "com.android.settings.flags" package: "com.android.settings.flags"
container: "system"
flag { flag {
name: "enable_volume_plus_quick_settings" name: "enable_volume_plus_quick_settings"

View File

@@ -1,4 +1,5 @@
package: "com.android.settings.flags" package: "com.android.settings.flags"
container: "system"
flag { flag {
name: "remove_key_hide_enable_2g" name: "remove_key_hide_enable_2g"

View File

@@ -1,4 +1,5 @@
package: "com.android.settings.flags" package: "com.android.settings.flags"
container: "system"
flag { flag {
name: "thread_settings_enabled" name: "thread_settings_enabled"

View File

@@ -1,4 +1,5 @@
package: "com.android.settings.flags" package: "com.android.settings.flags"
container: "system"
flag { flag {
name: "enable_voice_activation_apps_in_settings" name: "enable_voice_activation_apps_in_settings"