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 changes I62a9d0a1,Ie50b2f35 into main

Browse source 
* changes:
  Don't ignore exceptions in NsdManagerDownstreamTetheringTest
  Don't warn in tests for deprecation
This commit is contained in:
Jean Chalard 2025-05-15 00:05:56 -07:00 • committed by Android (Google) Code Review
commit 43aa539935
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/common/Android.bp
View file

@ -155,6 +155,10 @@ java_defaults {
// if sdk_version="" this gets automatically included, but here we need to add manually.
"framework-res",
],
// Tests must check a large number of deprecated methods and warning about it
// sends hundreds of warning lines flooding the useful warnings.
kotlincflags: ["-Xsuppress-warning=DEPRECATION"],
// TODO: add "-Xwarning-level=CheckResult:error" when Kotlin 2.2.0 is out
}
// defaults for tests that need to build against framework-connectivity's @hide APIs, but also
@ -178,6 +182,10 @@ java_defaults {
// if sdk_version="" this gets automatically included, but here we need to add manually.
"framework-res",
],
// Tests must check a large number of deprecated methods and warning about it
// sends hundreds of warning lines flooding the useful warnings.
kotlincflags: ["-Xsuppress-warning=DEPRECATION"],
// TODO: add "-Xwarning-level=CheckResult:error" when Kotlin 2.2.0 is out
defaults_visibility: ["//packages/modules/Connectivity/tests:__subpackages__"],
}

4
tests/cts/net/src/android/net/cts/NsdManagerDownstreamTetheringTest.kt
View file

@ -104,7 +104,7 @@ class NsdManagerDownstreamTetheringTest : EthernetTetheringTestBase() {
nsdManager.discoverServices(serviceType, NsdManager.PROTOCOL_DNS_SD, discoveryRecord)
discoveryRecord.expectCallback<NsdDiscoveryRecord.DiscoveryEvent.DiscoveryStarted>()
assertNotNull(downstreamReader.pollForQuery("$serviceType.local", 12 /* type PTR */))
} cleanupStep {
} cleanup {
nsdManager.stopServiceDiscovery(discoveryRecord)
discoveryRecord.expectCallback<NsdDiscoveryRecord.DiscoveryEvent.DiscoveryStopped>()
}
@ -137,7 +137,7 @@ class NsdManagerDownstreamTetheringTest : EthernetTetheringTestBase() {
val downstreamReader = downstreamIface.packetReader
assertNotNull(downstreamReader.pollForQuery("$serviceType.local", 12 /* type PTR */))
// TODO: Add another test to check packet reply can trigger serviceFound.
} cleanupStep {
} cleanup {
nsdManager.stopServiceDiscovery(discoveryRecord)
discoveryRecord.expectCallback<NsdDiscoveryRecord.DiscoveryEvent.DiscoveryStopped>()
}