joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Add end to end mainline beta test flag in connectivity module" into main

Browse source
This commit is contained in:
Dennis Shen 2025-06-12 06:39:28 -07:00 • committed by Android (Google) Code Review
commit 3ef53cc9ff
3 changed files with 35 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Tethering/Android.bp
View file

@ -65,6 +65,7 @@ java_defaults {
"androidx.annotation_annotation",
"connectivity-net-module-utils-bpf",
"com.android.net.flags-aconfig-java",
"com.android.tethering.beta.test.flags-aconfig-java",
"modules-utils-build",
"modules-utils-statemachine",
"networkstack-client",

17
common/Android.bp
View file

@ -20,6 +20,23 @@ package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
aconfig_declarations {
name: "tethering.beta.test.flags",
package: "com.android.tethering.beta.test",
container: "com.android.tethering",
srcs: ["mainline_beta_end_to_end_test.aconfig"],
}
java_aconfig_library {
name: "com.android.tethering.beta.test.flags-aconfig-java",
aconfig_declarations: "tethering.beta.test.flags",
defaults: ["framework-minus-apex-aconfig-java-defaults"],
min_sdk_version: "30",
apex_available: [
"com.android.tethering",
],
}
aconfig_declarations {
name: "com.android.net.flags-aconfig",
package: "com.android.net.flags",

17
common/mainline_beta_end_to_end_test.aconfig Normal file
View file

@ -0,0 +1,17 @@
package: "com.android.tethering.beta.test"
container: "com.android.tethering"
flag {
name: "beta_end_to_end_test_rw_flag"
namespace: "com_android_tethering"
description: "mainline beta RW end to end test flag"
bug: "123456789"
}
flag {
name: "beta_end_to_end_test_fixed_ro_flag"
namespace: "com_android_tethering"
description: "mainline beta fixed RO end to end test flag"
is_fixed_read_only: true
bug: "123456789"
}