Add lint baseline to address NewApi errors
We are enabling a new lint check where the min sdk != compile sdk.
It has produced a lot of errors and adding the baseline file(s)
allows us to continue work without introducing more problems.
Bug: 150847901
Test: m lint-check
Change-Id: I1d1db259c95d73522a90658b08b96e9d2e9910c6
diff --git a/Android.bp b/Android.bp
index a623101..a0ca937 100644
--- a/Android.bp
+++ b/Android.bp
@@ -110,6 +110,9 @@
],
sdk_version: "system_30",
visibility: ["//visibility:private"],
+ lint: {
+ baseline_filename: "lint-baseline-api-30-shims.xml",
+ },
}
// Shims for APIs being added to the current development version of Android. These APIs are not
@@ -210,6 +213,9 @@
"//packages/modules/NetworkStack/tests/unit",
"//packages/modules/NetworkStack/tests/integration",
],
+ lint: {
+ baseline_filename: "lint-baseline-current-lib.xml",
+ },
}
android_library {
@@ -228,6 +234,9 @@
"//packages/modules/NetworkStack/tests/unit",
"//packages/modules/NetworkStack/tests/integration",
],
+ lint: {
+ baseline_filename: "lint-baseline-stable-lib.xml",
+ },
}
filegroup {
diff --git a/lint-baseline-api-30-shims.xml b/lint-baseline-api-30-shims.xml
new file mode 100644
index 0000000..da541cd
--- /dev/null
+++ b/lint-baseline-api-30-shims.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`"
+ errorLine1=" return lp.getNat64Prefix();"
+ errorLine2=" ~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/apishim/30/com/android/networkstack/apishim/api30/NetworkInformationShimImpl.java"
+ line="85"
+ column="19"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `android.net.LinkProperties#setNat64Prefix`"
+ errorLine1=" lp.setNat64Prefix(prefix);"
+ errorLine2=" ~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/apishim/30/com/android/networkstack/apishim/api30/NetworkInformationShimImpl.java"
+ line="90"
+ column="12"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `android.net.LinkProperties#setDhcpServerAddress`"
+ errorLine1=" lp.setDhcpServerAddress(serverAddress);"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/apishim/30/com/android/networkstack/apishim/api30/NetworkInformationShimImpl.java"
+ line="109"
+ column="12"/>
+ </issue>
+
+</issues>
diff --git a/lint-baseline-current-lib.xml b/lint-baseline-current-lib.xml
new file mode 100644
index 0000000..e8cfe3e
--- /dev/null
+++ b/lint-baseline-current-lib.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`"
+ errorLine1=" newLp.setNat64Prefix(netlinkLinkProperties.getNat64Prefix());"
+ errorLine2=" ~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/src/android/net/ip/IpClient.java"
+ line="1337"
+ column="52"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `android.net.LinkProperties#setNat64Prefix`"
+ errorLine1=" newLp.setNat64Prefix(netlinkLinkProperties.getNat64Prefix());"
+ errorLine2=" ~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/src/android/net/ip/IpClient.java"
+ line="1337"
+ column="15"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `android.telephony.NetworkRegistrationInfo#getCellIdentity`"
+ errorLine1=" nri == null ? null : nri.getCellIdentity());"
+ errorLine2=" ~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java"
+ line="3088"
+ column="46"/>
+ </issue>
+
+</issues>
diff --git a/lint-baseline-stable-lib.xml b/lint-baseline-stable-lib.xml
new file mode 100644
index 0000000..e8cfe3e
--- /dev/null
+++ b/lint-baseline-stable-lib.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`"
+ errorLine1=" newLp.setNat64Prefix(netlinkLinkProperties.getNat64Prefix());"
+ errorLine2=" ~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/src/android/net/ip/IpClient.java"
+ line="1337"
+ column="52"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `android.net.LinkProperties#setNat64Prefix`"
+ errorLine1=" newLp.setNat64Prefix(netlinkLinkProperties.getNat64Prefix());"
+ errorLine2=" ~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/src/android/net/ip/IpClient.java"
+ line="1337"
+ column="15"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `android.telephony.NetworkRegistrationInfo#getCellIdentity`"
+ errorLine1=" nri == null ? null : nri.getCellIdentity());"
+ errorLine2=" ~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java"
+ line="3088"
+ column="46"/>
+ </issue>
+
+</issues>
diff --git a/tests/integration/lint-baseline.xml b/tests/integration/lint-baseline.xml
new file mode 100644
index 0000000..eadec6f
--- /dev/null
+++ b/tests/integration/lint-baseline.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `android.net.LinkProperties#getDhcpServerAddress`"
+ errorLine1=" assertEquals(SERVER_ADDR, captor.getValue().getDhcpServerAddress());"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java"
+ line="1327"
+ column="53"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`"
+ errorLine1=" argThat(lp -> Objects.equals(expected, lp.getNat64Prefix())));"
+ errorLine2=" ~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java"
+ line="1623"
+ column="59"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`"
+ errorLine1=" lp -> !Objects.equals(unchanged, lp.getNat64Prefix())));"
+ errorLine2=" ~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java"
+ line="1629"
+ column="53"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`"
+ errorLine1=" if (lp.getNat64Prefix() != null) {"
+ errorLine2=" ~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java"
+ line="1660"
+ column="16"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`"
+ errorLine1=" assertEquals(prefix, lp.getNat64Prefix());"
+ errorLine2=" ~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java"
+ line="1661"
+ column="37"/>
+ </issue>
+
+</issues>
diff --git a/tests/unit/lint-baseline.xml b/tests/unit/lint-baseline.xml
new file mode 100644
index 0000000..ededbea
--- /dev/null
+++ b/tests/unit/lint-baseline.xml
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"
+ errorLine1=" private static final NetworkCapabilities CELL_METERED_CAPABILITIES = new NetworkCapabilities()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java"
+ line="297"
+ column="74"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"
+ errorLine1=" new NetworkCapabilities()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java"
+ line="302"
+ column="13"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"
+ errorLine1=" new NetworkCapabilities()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java"
+ line="308"
+ column="13"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"
+ errorLine1=" new NetworkCapabilities().addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java"
+ line="314"
+ column="13"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"
+ errorLine1=" final NetworkCapabilities nc = new NetworkCapabilities()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java"
+ line="670"
+ column="40"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"
+ errorLine1=" final NetworkCapabilities nc = new NetworkCapabilities()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java"
+ line="690"
+ column="40"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"
+ errorLine1=" final NetworkCapabilities meteredCap = new NetworkCapabilities()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java"
+ line="726"
+ column="48"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"
+ errorLine1=" final NetworkCapabilities nonMeteredCap = new NetworkCapabilities()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java"
+ line="746"
+ column="51"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"
+ errorLine1=" final NetworkCapabilities nc = new NetworkCapabilities()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java"
+ line="2149"
+ column="40"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `android.net.NetworkCapabilities()`"
+ errorLine1=" private val EMPTY_CAPABILITIES = NetworkCapabilities()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/unit/src/com/android/networkstack/NetworkStackNotifierTest.kt"
+ line="134"
+ column="38"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `android.net.NetworkCapabilities()`"
+ errorLine1=" private val VALIDATED_CAPABILITIES = NetworkCapabilities()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/unit/src/com/android/networkstack/NetworkStackNotifierTest.kt"
+ line="135"
+ column="42"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"
+ errorLine1=" new NetworkCapabilities()"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/unit/src/com/android/networkstack/metrics/NetworkValidationMetricsTest.java"
+ line="57"
+ column="13"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"
+ errorLine1=" NetworkCapabilities nc = new NetworkCapabilities();"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/unit/src/com/android/networkstack/metrics/NetworkValidationMetricsTest.java"
+ line="109"
+ column="34"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"
+ errorLine1=" nc = new NetworkCapabilities();"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/unit/src/com/android/networkstack/metrics/NetworkValidationMetricsTest.java"
+ line="117"
+ column="14"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"
+ errorLine1=" nc = new NetworkCapabilities();"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/unit/src/com/android/networkstack/metrics/NetworkValidationMetricsTest.java"
+ line="123"
+ column="14"/>
+ </issue>
+
+ <issue
+ id="NewApi"
+ message="Call requires API level R (current min is 29): `new android.net.NetworkCapabilities`"
+ errorLine1=" nc = new NetworkCapabilities();"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="packages/modules/NetworkStack/tests/unit/src/com/android/networkstack/metrics/NetworkValidationMetricsTest.java"
+ line="129"
+ 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>
