summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kangping Dong <wgtdkp@google.com> 2024-01-24 16:47:23 +0800
committer Kangping Dong <wgtdkp@google.com> 2024-01-24 19:35:19 +0800
commit503b0e069b597b114cf64fdae103d467307ef60c (patch)
tree5b4452d3d2c7edc7bcf6d0ccd0f0f522659e1907
parent87fbc21ffbc126035bd76fbc1ee2c5f3018abb35 (diff)
[Thread] define Thread network flags for platform code
Bug: 319044650 Bug: 321624552 Change-Id: I838f722c6640b467379ebb890aed6af6570239e7
-rw-r--r--AconfigFlags.bp15
-rw-r--r--core/java/android/net/thread/OWNERS3
-rw-r--r--core/java/android/net/thread/flags.aconfig8
3 files changed, 26 insertions, 0 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index f5bf437a738d..c136dd7701cd 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -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",
diff --git a/core/java/android/net/thread/OWNERS b/core/java/android/net/thread/OWNERS
new file mode 100644
index 000000000000..55c307b5eb62
--- /dev/null
+++ b/core/java/android/net/thread/OWNERS
@@ -0,0 +1,3 @@
+# Bug component: 1203089
+
+include platform/packages/modules/ThreadNetwork:/OWNERS
diff --git a/core/java/android/net/thread/flags.aconfig b/core/java/android/net/thread/flags.aconfig
new file mode 100644
index 000000000000..6e72f8ebd8d1
--- /dev/null
+++ b/core/java/android/net/thread/flags.aconfig
@@ -0,0 +1,8 @@
+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"
+}