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
Change-Id: I8f52d5f86e6ffaccd624846fbe1ba0a8fc842af6
This commit is contained in:
@@ -6,7 +6,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",
|
container: "system_ext",
|
||||||
srcs: [
|
srcs: [
|
||||||
"*.aconfig",
|
"*.aconfig",
|
||||||
"catalyst/*.aconfig",
|
"catalyst/*.aconfig",
|
||||||
@@ -21,7 +21,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",
|
container: "system_ext",
|
||||||
srcs: ["factory_reset/*.aconfig"],
|
srcs: ["factory_reset/*.aconfig"],
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -33,7 +33,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",
|
container: "system_ext",
|
||||||
srcs: ["media_drm/*.aconfig"],
|
srcs: ["media_drm/*.aconfig"],
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -45,7 +45,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",
|
container: "system_ext",
|
||||||
srcs: ["accessibility/*.aconfig"],
|
srcs: ["accessibility/*.aconfig"],
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,7 +57,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",
|
container: "system_ext",
|
||||||
srcs: [
|
srcs: [
|
||||||
"development/**/*.aconfig",
|
"development/**/*.aconfig",
|
||||||
],
|
],
|
||||||
@@ -71,7 +71,7 @@ java_aconfig_library {
|
|||||||
aconfig_declarations {
|
aconfig_declarations {
|
||||||
name: "keyboard_flags",
|
name: "keyboard_flags",
|
||||||
package: "com.android.settings.keyboard",
|
package: "com.android.settings.keyboard",
|
||||||
container: "system",
|
container: "system_ext",
|
||||||
srcs: ["keyboard/*.aconfig"],
|
srcs: ["keyboard/*.aconfig"],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.accessibility"
|
package: "com.android.settings.accessibility"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.
|
# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "catalyst_legal_information"
|
name: "catalyst_legal_information"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "catalyst_accessibility_color_and_motion"
|
name: "catalyst_accessibility_color_and_motion"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "catalyst_power_usage_summary_screen"
|
name: "catalyst_power_usage_summary_screen"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "catalyst_bluetooth_switchbar_screen"
|
name: "catalyst_bluetooth_switchbar_screen"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "catalyst_display_settings_screen"
|
name: "catalyst_display_settings_screen"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "catalyst_location_settings"
|
name: "catalyst_location_settings"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "catalyst_lockscreen_from_display_settings"
|
name: "catalyst_lockscreen_from_display_settings"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "catalyst_network_provider_and_internet_screen"
|
name: "catalyst_network_provider_and_internet_screen"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "catalyst_sound_screen"
|
name: "catalyst_sound_screen"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "catalyst_language_setting"
|
name: "catalyst_language_setting"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.development"
|
package: "com.android.settings.development"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "deprecate_list_activity"
|
name: "deprecate_list_activity"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.factory_reset"
|
package: "com.android.settings.factory_reset"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "enable_factory_reset_wizard"
|
name: "enable_factory_reset_wizard"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.keyboard"
|
package: "com.android.settings.keyboard"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "keyboard_layout_picker_activity_enabled"
|
name: "keyboard_layout_picker_activity_enabled"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.keyboard"
|
package: "com.android.settings.keyboard"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "keyboard_and_touchpad_a11y_new_page_enabled"
|
name: "keyboard_and_touchpad_a11y_new_page_enabled"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.media_drm"
|
package: "com.android.settings.media_drm"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "force_l3_enabled"
|
name: "force_l3_enabled"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
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
|
# 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
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "biometric_settings_provider"
|
name: "biometric_settings_provider"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "sfps_enroll_refinement"
|
name: "sfps_enroll_refinement"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "enable_offload_bluetooth_operations_to_background_thread"
|
name: "enable_offload_bluetooth_operations_to_background_thread"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "rotation_connected_display_setting"
|
name: "rotation_connected_display_setting"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "enable_contacts_default_account_in_settings"
|
name: "enable_contacts_default_account_in_settings"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "datetime_feedback"
|
name: "datetime_feedback"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.
|
# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "enable_device_diagnostics_in_settings"
|
name: "enable_device_diagnostics_in_settings"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "protect_screen_timeout_with_auth"
|
name: "protect_screen_timeout_with_auth"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "new_apn_page_enabled"
|
name: "new_apn_page_enabled"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "show_factory_reset_cancel_button"
|
name: "show_factory_reset_cancel_button"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "terms_of_address_enabled"
|
name: "terms_of_address_enabled"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "dedupe_dnd_settings_channels"
|
name: "dedupe_dnd_settings_channels"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "enable_sound_backup"
|
name: "enable_sound_backup"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "enable_perform_backup_tasks_in_settings"
|
name: "enable_perform_backup_tasks_in_settings"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "protect_lock_after_timeout_with_auth"
|
name: "protect_lock_after_timeout_with_auth"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "remove_key_hide_enable_2g"
|
name: "remove_key_hide_enable_2g"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "thread_settings_enabled"
|
name: "thread_settings_enabled"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
flag {
|
flag {
|
||||||
name: "enable_voice_activation_apps_in_settings"
|
name: "enable_voice_activation_apps_in_settings"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package: "com.android.settings.flags"
|
package: "com.android.settings.flags"
|
||||||
container: "system"
|
container: "system_ext"
|
||||||
|
|
||||||
# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.
|
# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user