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

Commit 1aaa1f96 authored by Oriol Prieto Gasco's avatar Oriol Prieto Gasco Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE am: 0a441b2f 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3068647



Change-Id: Ia5cc1f4909193ced38a676a7bc84e9795d823bec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 883f1e9d 0a441b2f

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"