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

Commit 0a441b2f authored by Oriol Prieto Gasco's avatar Oriol Prieto Gasco Committed by Oriol Prieto Gascó
Browse files

RESTRICT AUTOMERGE 

Set the container field of aconfig flags

Test: printflags --format='{package}:{container}:' | grep "::"
Bug: 312769710
Flag: NONE
Change-Id: I4fc69f563ead7206ef48278be4fb4cbcfc9cb1f7
parent 8c85f8b3

aconfig/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ package { 
aconfig_declarations {

    name: "aconfig_settings_flags",

    package: "com.android.settings.flags",

    container: "system",

    srcs: [

        "*.aconfig",

    ],
@@ -18,6 +19,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "factory_reset_flags",

    package: "com.android.settings.factory_reset",

    container: "system",

    srcs: ["factory_reset/*.aconfig"],

}
@@ -29,6 +31,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "media_drm_flags",

    package: "com.android.settings.media_drm",

    container: "system",

    srcs: ["media_drm/*.aconfig"],

}
@@ -40,6 +43,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "accessibility_flags",

    package: "com.android.settings.accessibility",

    container: "system",

    srcs: ["accessibility/*.aconfig"],

}
@@ -51,6 +55,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "development_settings_flags",

    package: "com.android.settings.development",

    container: "system",

    srcs: [

        "development/**/*.aconfig"

    ],

aconfig/accessibility/accessibility_flags.aconfig

+1 −0
Original line number Diff line number Diff line 
package: "com.android.settings.accessibility"

container: "system"



# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.

aconfig/development/settings_core_flag_declarations.aconfig

+1 −0
Original line number Diff line number Diff line 
package: "com.android.settings.development"

container: "system"



flag {

  name: "a2dp_offload_codec_extensibility_settings"

aconfig/factory_reset/factory_reset_flag_declarations.aconfig

+1 −0
Original line number Diff line number Diff line 
package: "com.android.settings.factory_reset"

container: "system"



flag {

  name: "enable_factory_reset_wizard"

aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig

+1 −0
Original line number Diff line number Diff line 
package: "com.android.settings.media_drm"

container: "system"



flag {

    name: "force_l3_enabled"