diff options
| author | 2024-12-09 21:18:32 +0000 | |
|---|---|---|
| committer | 2024-12-09 21:18:32 +0000 | |
| commit | bfeed981b0f138ad1e9dcb6ed3e942e553988af2 (patch) | |
| tree | d44ec9eb7dc13655e15b8415325af2f2e24e314d | |
| parent | 3c8775b6a7429613aef3abd95d748d4b96448ebd (diff) | |
| parent | ebf26184b599d9d213dbae48ee0d034063258d6d (diff) | |
Merge "remove system_ext aconfig_flags.pb look up" into main am: ebf26184b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3398702
Change-Id: I3ff28d26870d049ab2f3ef70e91661f3870222e6
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 fbce6ca07b3e..38becd4decd2 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java @@ -68,7 +68,6 @@ import java.util.Map; 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 c0e61eefb4dd..5dc0747780d1 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"); |