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

Commit 891ea3d1 authored by Nikhil Nayunigari's avatar Nikhil Nayunigari Committed by Android (Google) Code Review
Browse files

Merge "Feature flag for Ethernet Settings" into main

parents 54bb776d adf30c57

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ android_library { 
        "setupdesign-lottie-loading-layout",

        "device_policy_aconfig_flags_lib",

        "keyboard_flags_lib",

        "settings_connectivity_flags",

    ],



    plugins: [

aconfig/Android.bp

+12 −0
Original line number Diff line number Diff line
@@ -79,3 +79,15 @@ java_aconfig_library { 
    name: "keyboard_flags_lib",

    aconfig_declarations: "keyboard_flags",

}



aconfig_declarations {

    name: "settings_connectivity_flags",

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

    container: "system",

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

}



java_aconfig_library {

    name: "settings_connectivity_flags_lib",

    aconfig_declarations: "settings_connectivity_flags",

}

aconfig/connectivity/settings_ethernet_declarations.aconfig

0 → 100644
+9 −0
Original line number Diff line number Diff line 
package: "com.android.settings.connectivity"

container: "system"



flag {

  name: "ethernet_settings"

  namespace: "connectivity"

  description: "Flag for Ethernet settings"

  bug: "372928532"

}