summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dennis Shen <dzshen@google.com> 2023-11-02 17:01:01 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-11-02 17:01:01 +0000
commit90682be5470b0fd0f60cd6a69554c2a3796ceffd (patch)
tree2eefb8a6bc09cd14eb6378624f74dbf6e5826c69
parentd156f7fb44ccdd26744d37762653c91ea96cc681 (diff)
parent083f2e1d702750ba347b913d0db2072bf839ac7f (diff)
Merge "Correct the aconfig_flags entries" into main
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java b/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java
index 976ba215d349..6bc27160c0a8 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java
@@ -68,7 +68,7 @@ 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",
- "/system_ext/etc/aconfig_flags.pb",
+ "/product/etc/aconfig_flags.pb",
"/vendor/etc/aconfig_flags.pb");
private static final List<String> PRIVATE_NAMESPACES = List.of(