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

Commit ebf26184 authored by Dennis Shen's avatar Dennis Shen Committed by Gerrit Code Review
Browse files

Merge "remove system_ext aconfig_flags.pb look up" into main

parents 340592dd f7a41c8d

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

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

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");