Merge "Revert "Replace system_ext container with system"" into main

aconfig/Android.bp

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

aconfig/accessibility/accessibility_flags.aconfig

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

aconfig/catalyst/about_phone.aconfig

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

aconfig/catalyst/accessibility.aconfig

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

aconfig/catalyst/battery.aconfig

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

aconfig/catalyst/connected_devices.aconfig

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

aconfig/catalyst/display.aconfig

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

aconfig/catalyst/location.aconfig

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

aconfig/catalyst/lockscreen.aconfig

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

aconfig/catalyst/network_and_internet.aconfig

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

aconfig/catalyst/sound_screen.aconfig

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

aconfig/catalyst/system.aconfig

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

aconfig/development/settings_core_flag_declarations.aconfig

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

aconfig/factory_reset/factory_reset_flag_declarations.aconfig

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

aconfig/keyboard/settings_keyboard_layout_picker_features.aconfig

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

aconfig/keyboard/settings_physical_keyboard_a11y_features.aconfig

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

aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig

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

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

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"

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"

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"

aconfig/settings_connecteddevice_flag_declarations.aconfig

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

aconfig/settings_contacts_default_account_flag_declarations.aconfig

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

aconfig/settings_datetime_flag_declarations.aconfig

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

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.
 

aconfig/settings_device_diagnostics_declarations.aconfig

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

aconfig/settings_display_flag_declarations.aconfig

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

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"

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"

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"

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"

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"

aconfig/settings_perform_backup_tasks_flag_declarations.aconfig

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

aconfig/settings_security_flag_declarations.aconfig

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

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"

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"

aconfig/settings_voice_activation_apps_flag_declarations.aconfig

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

aconfig/settings_wifi_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.