Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 48b13e5

Browse files
Justin YunCherrypicker Worker
Justin Yun
authored and
Cherrypicker Worker
committed
Revert "Replace system_ext container with system"
This reverts commit 6e1b274. 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
1 parent b84bb94 commit 48b13e5

10 files changed

+10
-10
lines changed

aconfig/catalyst/accessibility.aconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package: "com.android.settings.flags"
2-
container: "system"
2+
container: "system_ext"
33

44
flag {
55
name: "catalyst_accessibility_color_and_motion"

aconfig/catalyst/battery.aconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package: "com.android.settings.flags"
2-
container: "system"
2+
container: "system_ext"
33

44
flag {
55
name: "catalyst_power_usage_summary_screen"

aconfig/catalyst/connected_devices.aconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package: "com.android.settings.flags"
2-
container: "system"
2+
container: "system_ext"
33

44
flag {
55
name: "catalyst_bluetooth_switchbar_screen"

aconfig/catalyst/display.aconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package: "com.android.settings.flags"
2-
container: "system"
2+
container: "system_ext"
33

44
flag {
55
name: "catalyst_display_settings_screen"

aconfig/catalyst/location.aconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package: "com.android.settings.flags"
2-
container: "system"
2+
container: "system_ext"
33

44
flag {
55
name: "catalyst_location_settings"

aconfig/catalyst/lockscreen.aconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package: "com.android.settings.flags"
2-
container: "system"
2+
container: "system_ext"
33

44
flag {
55
name: "catalyst_lockscreen_from_display_settings"

aconfig/catalyst/network_and_internet.aconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package: "com.android.settings.flags"
2-
container: "system"
2+
container: "system_ext"
33

44
flag {
55
name: "catalyst_network_provider_and_internet_screen"

aconfig/catalyst/sound_screen.aconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package: "com.android.settings.flags"
2-
container: "system"
2+
container: "system_ext"
33

44
flag {
55
name: "catalyst_sound_screen"

aconfig/catalyst/system.aconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package: "com.android.settings.flags"
2-
container: "system"
2+
container: "system_ext"
33

44
flag {
55
name: "catalyst_language_setting"

aconfig/keyboard/settings_keyboard_layout_picker_features.aconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package: "com.android.settings.keyboard"
2-
container: "system"
2+
container: "system_ext"
33

44
flag {
55
name: "keyboard_layout_picker_activity_enabled"

0 commit comments

Comments
 (0)