diff options
| author | 2024-12-09 22:05:37 +0000 | |
|---|---|---|
| committer | 2024-12-09 22:05:37 +0000 | |
| commit | 09429c7d24cc423d4fe99dad6fe2c92bf3ec2a30 (patch) | |
| tree | 33852bbcbb6326263064ed9c43494376ae7d8630 | |
| parent | 003da44ff0458e05caad7f082ac7fa2f622d29fc (diff) | |
| parent | bfeed981b0f138ad1e9dcb6ed3e942e553988af2 (diff) | |
Merge "remove system_ext aconfig_flags.pb look up" into main am: ebf26184b5 am: bfeed981b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3398702
Change-Id: I4f958a3a23e5b4b92e1c8b23e9f2c10183885191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java | 1 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java b/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java index 1eff0eee606d..91ac34ac8233 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java @@ -72,7 +72,6 @@ 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"); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java index 7aed61533aac..5cd534e62ea9 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java @@ -171,7 +171,6 @@ final 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"); |