Revert "Replace system_ext container with system"

This reverts commit 6e1b274f03.

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
This commit is contained in:
Justin Yun
2025-01-17 12:32:05 +09:00
parent 62c017beb5
commit e0c046c187
28 changed files with 33 additions and 33 deletions

View File

@@ -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"],
}

View File

@@ -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.

View File

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

View File

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

View File

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

View File

@@ -1,5 +1,5 @@
package: "com.android.settings.keyboard"
container: "system"
container: "system_ext"
flag {
name: "keyboard_and_touchpad_a11y_new_page_enabled"

View File

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

View File

@@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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.

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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.