From 015bb86af7581e173facd43ce8a0b8dc11f116f1 Mon Sep 17 00:00:00 2001
From: Justin Yun <justinyun@google.com>
Date: Thu, 23 Jan 2025 22:43:20 -0800
Subject: [PATCH] Revert "Replace system_ext container with system"

This reverts commit d80efafdc0df5afae43883778202c243e21b0e45.

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:da76a663533d3ba4455ad226454a5cb7631c6f7e)
Merged-In: I92387e6d5764c750f83bd8d266f6da969e114a72
Change-Id: I92387e6d5764c750f83bd8d266f6da969e114a72
---
 aconfig/Android.bp                | 2 +-
 aconfig/launcher.aconfig          | 2 +-
 aconfig/launcher_overview.aconfig | 2 +-
 aconfig/launcher_search.aconfig   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/aconfig/Android.bp b/aconfig/Android.bp
index 5413601382..bca7494a04 100644
--- a/aconfig/Android.bp
+++ b/aconfig/Android.bp
@@ -20,7 +20,7 @@ package {
 aconfig_declarations {
     name: "com_android_launcher3_flags",
     package: "com.android.launcher3",
-    container: "system",
+    container: "system_ext",
     srcs: ["**/*.aconfig"],
 }
 
diff --git a/aconfig/launcher.aconfig b/aconfig/launcher.aconfig
index 4d6c7ab032..4d78c33200 100644
--- a/aconfig/launcher.aconfig
+++ b/aconfig/launcher.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.launcher3"
-container: "system"
+container: "system_ext"
 
 flag {
     name: "enable_expanding_pause_work_button"
diff --git a/aconfig/launcher_overview.aconfig b/aconfig/launcher_overview.aconfig
index 853faf8167..23733a4ff3 100644
--- a/aconfig/launcher_overview.aconfig
+++ b/aconfig/launcher_overview.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.launcher3"
-container: "system"
+container: "system_ext"
 
 flag {
     name: "enable_grid_only_overview"
diff --git a/aconfig/launcher_search.aconfig b/aconfig/launcher_search.aconfig
index 72f654e79a..b98eee6e32 100644
--- a/aconfig/launcher_search.aconfig
+++ b/aconfig/launcher_search.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.launcher3"
-container: "system"
+container: "system_ext"
 
 flag {
     name: "enable_private_space"