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

Commit a039e101 authored by Yiyi Shen's avatar Yiyi Shen Committed by Android (Google) Code Review
Browse files

Merge "Rename aconfig declarations to a common name." into main

parents 6ef678f1 27d709ac

aconfig/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ package { 
}



aconfig_declarations {

    name: "aconfig_settings_connecteddevice_flags",

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

    name: "aconfig_settings_flags",

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

    srcs: [

        "settings_connecteddevice_flag_declarations.aconfig",

    ],
@@ -12,6 +12,6 @@ aconfig_declarations { 


java_aconfig_library {

    name: "aconfig_settings_flags_lib",

    aconfig_declarations: "aconfig_settings_connecteddevice_flags",

    aconfig_declarations: "aconfig_settings_flags",

}

aconfig/settings_connecteddevice_flag_declarations.aconfig

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

package: "com.android.settings.flags"



flag {

  name: "enable_subsequent_pair_settings_integration"