Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26e3005e authored Mar 04, 2025 by Treehugger Robot Committed by Automerger Merge Worker Mar 04, 2025

Merge "Add system_ext partition to aconfig_flags.pb paths" into main am: 7b30de07 am: 6cf075bb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3459748

Change-Id: Ic809850973996a780552693ecaafb3a32e014616
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 23cd6a96 6cf075bb

packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@ import java.util.regex.Pattern;
		public final class DeviceConfigService extends Binder {
		private static final List<String> sAconfigTextProtoFilesOnDevice = List.of(
		"/system/etc/aconfig_flags.pb",
		"/system_ext/etc/aconfig_flags.pb",
		"/product/etc/aconfig_flags.pb",
		"/vendor/etc/aconfig_flags.pb");

packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -158,6 +158,7 @@ public class SettingsState {

		private static final List<String> sAconfigTextProtoFilesOnDevice = List.of(
		"/system/etc/aconfig_flags.pb",
		"/system_ext/etc/aconfig_flags.pb",
		"/product/etc/aconfig_flags.pb",
		"/vendor/etc/aconfig_flags.pb");