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

Commit c30b0657 authored by Kangping Dong's avatar Kangping Dong Committed by Automerger Merge Worker
Browse files

Merge "[Thread] define Thread network flags for platform code" into main am: 5059e0cc 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2926431



Change-Id: Icf6b61040a7b68b6e1229d49a09dbc5f3c7172ed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7c191292 5059e0cc

AconfigFlags.bp

+15 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ aconfig_srcjars = [ 
    ":com.android.hardware.camera2-aconfig-java{.generated_srcjars}",

    ":com.android.hardware.input-aconfig-java{.generated_srcjars}",

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

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

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

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

    // !!! KEEP THIS LIST ALPHABETICAL !!!
@@ -44,6 +45,7 @@ stubs_defaults { 
        "android.security.flags-aconfig",

        "com.android.hardware.camera2-aconfig",

        "com.android.hardware.input.input-aconfig",

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

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

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

        "com.android.net.flags-aconfig",
@@ -247,12 +249,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"

}