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

Commit 8427d5d2 authored by Dennis Shen's avatar Dennis Shen Committed by Android (Google) Code Review
Browse files

Merge "Replace system_ext container with system" into main

parents 16b98318 6e1b274f

aconfig/Android.bp

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

    name: "aconfig_settings_flags",

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

    container: "system_ext",

    container: "system",

    srcs: [

        "*.aconfig",

    ],
@@ -20,7 +20,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "factory_reset_flags",

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

    container: "system_ext",

    container: "system",

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

}
@@ -32,7 +32,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "media_drm_flags",

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

    container: "system_ext",

    container: "system",

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

}
@@ -44,7 +44,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "accessibility_flags",

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

    container: "system_ext",

    container: "system",

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

}
@@ -56,7 +56,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "development_settings_flags",

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

    container: "system_ext",

    container: "system",

    srcs: [

        "development/**/*.aconfig",

    ],
@@ -70,7 +70,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "keyboard_flags",

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

    container: "system_ext",

    container: "system",

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

}

aconfig/accessibility/accessibility_flags.aconfig

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

container: "system_ext"

container: "system"



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

aconfig/development/settings_core_flag_declarations.aconfig

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

container: "system_ext"

container: "system"



flag {

  name: "a2dp_offload_codec_extensibility_settings"

aconfig/factory_reset/factory_reset_flag_declarations.aconfig

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

container: "system_ext"

container: "system"



flag {

  name: "enable_factory_reset_wizard"

aconfig/keyboard/settings_physical_keyboard_a11y_features.aconfig

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

container: "system_ext"

container: "system"



flag {

  name: "keyboard_and_touchpad_a11y_new_page_enabled"