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 "Conditionally disable TetheringApiCurrentLib"

Browse source
This commit is contained in:
Treehugger Robot 2022-01-28 05:21:22 +00:00 • committed by Gerrit Code Review
commit 2be7b1d5fb
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Tethering/Android.bp
View file

@ -65,6 +65,7 @@ java_defaults {
android_library {
name: "TetheringApiCurrentLib",
defaults: [
"ConnectivityNextEnableDefaults",
"TetheringAndroidLibraryDefaults",
"TetheringApiLevel"
],
@ -159,7 +160,7 @@ java_defaults {
// Non-updatable tethering running in the system server process for devices not using the module
android_app {
name: "InProcessTethering",
defaults: ["TetheringAppDefaults", "TetheringApiLevel"],
defaults: ["TetheringAppDefaults", "TetheringApiLevel", "ConnectivityNextEnableDefaults"],
static_libs: ["TetheringApiCurrentLib"],
certificate: "platform",
manifest: "AndroidManifest_InProcess.xml",

2
tests/cts/net/Android.bp
View file

@ -70,7 +70,7 @@ java_defaults {
// devices.
android_test {
name: "CtsNetTestCases",
defaults: ["CtsNetTestCasesDefaults", "NetworkStackNextEnableDefaults"],
defaults: ["CtsNetTestCasesDefaults", "ConnectivityNextEnableDefaults"],
// TODO: CTS should not depend on the entirety of the networkstack code.
static_libs: [
"NetworkStackApiCurrentLib",