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

Commit b171b308 authored by Kangping Dong's avatar Kangping Dong Committed by Android (Google) Code Review
Browse files

Merge "[Thread] define Thread network flags for platform code" into main

parents 83c09a48 503b0e06

AconfigFlags.bp

+15 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ aconfig_srcjars = [ 
    ":com.android.internal.foldables.flags-aconfig-java{.generated_srcjars}",

    ":com.android.media.flags.bettertogether-aconfig-java{.generated_srcjars}",

    ":com.android.net.flags-aconfig-java{.generated_srcjars}",

    ":com.android.net.thread.flags-aconfig-java{.generated_srcjars}",

    ":com.android.server.flags.services-aconfig-java{.generated_srcjars}",

    ":com.android.text.flags-aconfig-java{.generated_srcjars}",

    ":com.android.window.flags.window-aconfig-java{.generated_srcjars}",
@@ -133,6 +134,7 @@ stubs_defaults { 
        "com.android.input.flags-aconfig",

        "com.android.media.flags.bettertogether-aconfig",

        "com.android.net.flags-aconfig",

        "com.android.net.thread.flags-aconfig",

        "com.android.server.flags.services-aconfig",

        "com.android.text.flags-aconfig",

        "com.android.window.flags.window-aconfig",
@@ -760,12 +762,25 @@ aconfig_declarations { 
    srcs: ["core/java/android/net/flags.aconfig"],

}



// Thread network

aconfig_declarations {

    name: "com.android.net.thread.flags-aconfig",

    package: "com.android.net.thread.flags",

    srcs: ["core/java/android/net/thread/flags.aconfig"],

}



java_aconfig_library {

    name: "com.android.net.flags-aconfig-java",

    aconfig_declarations: "com.android.net.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "com.android.net.thread.flags-aconfig-java",

    aconfig_declarations: "com.android.net.thread.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Media

aconfig_declarations {

    name: "android.media.playback.flags-aconfig",

core/java/android/net/thread/OWNERS

0 → 100644
+3 −0
Original line number Diff line number Diff line 
# Bug component: 1203089



include platform/packages/modules/ThreadNetwork:/OWNERS

core/java/android/net/thread/flags.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "com.android.net.thread.flags"



flag {

    name: "thread_user_restriction_enabled"

    namespace: "thread_network"

    description: "Controls whether user restriction on thread networks is enabled"

    bug: "307679182"

}