From 48b13e5cb15d5969d3d7c935d6205846cff03a7d Mon Sep 17 00:00:00 2001
From: Justin Yun <justinyun@google.com>
Date: Fri, 17 Jan 2025 12:32:05 +0900
Subject: [PATCH] Revert "Replace system_ext container with system"

This reverts commit 6e1b274f03cab386f39c7d7c0b0487b4dcad6af3.

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
---
 aconfig/catalyst/accessibility.aconfig                          | 2 +-
 aconfig/catalyst/battery.aconfig                                | 2 +-
 aconfig/catalyst/connected_devices.aconfig                      | 2 +-
 aconfig/catalyst/display.aconfig                                | 2 +-
 aconfig/catalyst/location.aconfig                               | 2 +-
 aconfig/catalyst/lockscreen.aconfig                             | 2 +-
 aconfig/catalyst/network_and_internet.aconfig                   | 2 +-
 aconfig/catalyst/sound_screen.aconfig                           | 2 +-
 aconfig/catalyst/system.aconfig                                 | 2 +-
 .../keyboard/settings_keyboard_layout_picker_features.aconfig   | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/aconfig/catalyst/accessibility.aconfig b/aconfig/catalyst/accessibility.aconfig
index 783706709a1..fe0d7a5347b 100644
--- a/aconfig/catalyst/accessibility.aconfig
+++ b/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"
diff --git a/aconfig/catalyst/battery.aconfig b/aconfig/catalyst/battery.aconfig
index cec40f3746b..7c152d9175c 100644
--- a/aconfig/catalyst/battery.aconfig
+++ b/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"
diff --git a/aconfig/catalyst/connected_devices.aconfig b/aconfig/catalyst/connected_devices.aconfig
index 7a335fa4675..5b7a70bdbf0 100644
--- a/aconfig/catalyst/connected_devices.aconfig
+++ b/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"
diff --git a/aconfig/catalyst/display.aconfig b/aconfig/catalyst/display.aconfig
index 9485e70fc1d..11c1d3a592c 100644
--- a/aconfig/catalyst/display.aconfig
+++ b/aconfig/catalyst/display.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.flags"
-container: "system"
+container: "system_ext"
 
 flag {
   name: "catalyst_display_settings_screen"
diff --git a/aconfig/catalyst/location.aconfig b/aconfig/catalyst/location.aconfig
index c656bf3ea58..24f2c538d8a 100644
--- a/aconfig/catalyst/location.aconfig
+++ b/aconfig/catalyst/location.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.flags"
-container: "system"
+container: "system_ext"
 
 flag {
   name: "catalyst_location_settings"
diff --git a/aconfig/catalyst/lockscreen.aconfig b/aconfig/catalyst/lockscreen.aconfig
index 9a84f66af15..280171af32d 100644
--- a/aconfig/catalyst/lockscreen.aconfig
+++ b/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"
diff --git a/aconfig/catalyst/network_and_internet.aconfig b/aconfig/catalyst/network_and_internet.aconfig
index aa26ce42be6..e39b182bdee 100644
--- a/aconfig/catalyst/network_and_internet.aconfig
+++ b/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"
diff --git a/aconfig/catalyst/sound_screen.aconfig b/aconfig/catalyst/sound_screen.aconfig
index ac7f8bc1b80..1eacc3a7b3e 100644
--- a/aconfig/catalyst/sound_screen.aconfig
+++ b/aconfig/catalyst/sound_screen.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.flags"
-container: "system"
+container: "system_ext"
 
 flag {
     name: "catalyst_sound_screen"
diff --git a/aconfig/catalyst/system.aconfig b/aconfig/catalyst/system.aconfig
index f87ff44a909..4cd1cd90bae 100644
--- a/aconfig/catalyst/system.aconfig
+++ b/aconfig/catalyst/system.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.flags"
-container: "system"
+container: "system_ext"
 
 flag {
     name: "catalyst_language_setting"
diff --git a/aconfig/keyboard/settings_keyboard_layout_picker_features.aconfig b/aconfig/keyboard/settings_keyboard_layout_picker_features.aconfig
index 18684ab7344..79e9ddc27c9 100644
--- a/aconfig/keyboard/settings_keyboard_layout_picker_features.aconfig
+++ b/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"