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

Commit 09429c7d authored by Dennis Shen's avatar Dennis Shen Committed by Automerger Merge Worker
Browse files

Merge "remove system_ext aconfig_flags.pb look up" into main am: ebf26184 am: bfeed981 

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



Change-Id: I4f958a3a23e5b4b92e1c8b23e9f2c10183885191
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 003da44f bfeed981

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

+0 −1
Original line number Diff line number Diff line
@@ -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");

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

+0 −1
Original line number Diff line number Diff line
@@ -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");