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

Commit 7b30de07 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add system_ext partition to aconfig_flags.pb paths" into main

parents 37468944 ad489cf9

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

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 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

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