Merge "Address linter error in TestableNetworkCallbackTest" (25b0aeb2) · Commits · e / os / android_packages_modules_NetworkStack

tests/unit/lint-baseline.xml

+0 −77

Original line number	Diff line number	Diff line
		@@ -78,81 +78,4 @@
		column="14"/>
		</issue>

		<issue
		id="NewApi"
		message="Call requires API level R (current min is 29): `android.net.NetworkCapabilities()`"
		errorLine1=" mCallback.onCapabilitiesChanged(net2097, NetworkCapabilities())"
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="packages/modules/NetworkStack/tests/unit/src/android/net/testutils/TestableNetworkCallbackTest.kt"
		line="59"
		column="50"/>
		</issue>

		<issue
		id="NewApi"
		message="Call requires API level R (current min is 29): `android.net.NetworkCapabilities()`"
		errorLine1=" mCallback.onCapabilitiesChanged(net2098, NetworkCapabilities())"
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="packages/modules/NetworkStack/tests/unit/src/android/net/testutils/TestableNetworkCallbackTest.kt"
		line="71"
		column="50"/>
		</issue>

		<issue
		id="NewApi"
		message="Call requires API level R (current min is 29): `android.net.NetworkCapabilities()`"
		errorLine1=" val meteredNc = NetworkCapabilities()"
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="packages/modules/NetworkStack/tests/unit/src/android/net/testutils/TestableNetworkCallbackTest.kt"
		line="108"
		column="25"/>
		</issue>

		<issue
		id="NewApi"
		message="Call requires API level R (current min is 29): `android.net.NetworkCapabilities()`"
		errorLine1=" val unmeteredNc = NetworkCapabilities().addCapability(NOT_METERED)"
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="packages/modules/NetworkStack/tests/unit/src/android/net/testutils/TestableNetworkCallbackTest.kt"
		line="109"
		column="27"/>
		</issue>

		<issue
		id="NewApi"
		message="Call requires API level R (current min is 29): `android.net.NetworkCapabilities()`"
		errorLine1=" val netCaps = NetworkCapabilities().addTransportType(CELLULAR)"
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="packages/modules/NetworkStack/tests/unit/src/android/net/testutils/TestableNetworkCallbackTest.kt"
		line="130"
		column="23"/>
		</issue>

		<issue
		id="NewApi"
		message="Call requires API level R (current min is 29): `android.net.NetworkCapabilities()`"
		errorLine1=" val netCaps = NetworkCapabilities().addCapability(NOT_METERED).addTransportType(WIFI)"
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="packages/modules/NetworkStack/tests/unit/src/android/net/testutils/TestableNetworkCallbackTest.kt"
		line="152"
		column="23"/>
		</issue>

		<issue
		id="NewApi"
		message="Call requires API level R (current min is 29): `android.net.NetworkCapabilities()`"
		errorLine1=" "CapabilitiesChanged" -> cb.onCapabilitiesChanged(net, NetworkCapabilities())"
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="packages/modules/NetworkStack/tests/unit/src/android/net/testutils/TestableNetworkCallbackTest.kt"
		line="279"
		column="68"/>
		</issue>

		</issues>

tests/unit/src/android/net/testutils/TestableNetworkCallbackTest.kt

+3 −0

Original line number	Diff line number	Diff line
		package android.net.testutils

		import android.annotation.SuppressLint
		import android.net.LinkAddress
		import android.net.LinkProperties
		import android.net.Network
		@@ -33,6 +34,7 @@ const val CELLULAR = NetworkCapabilities.TRANSPORT_CELLULAR
		const val TEST_INTERFACE_NAME = "testInterfaceName"

		@RunWith(JUnit4::class)
		@SuppressLint("NewApi") // Uses hidden APIs, which the linter would identify as missing APIs.
		class TestableNetworkCallbackTest {
		private lateinit var mCallback: TestableNetworkCallback

		@@ -254,6 +256,7 @@ private fun callbackEntryFromString(name: String): KClass<out CallbackEntry> {
		return CallbackEntry::class.sealedSubclasses.first { it.simpleName == name }
		}

		@SuppressLint("NewApi") // Uses hidden APIs, which the linter would identify as missing APIs.
		private val interpretTable = listOf<InterpretMatcher<TestableNetworkCallback>>(
		// Interpret "Available(xx)" as "call to onAvailable with netId xx", and likewise for
		// all callback types. This is implemented above by enumerating the subclasses of