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 "Baseline NewApi issues" into main am: d421562323

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2925602

Change-Id: I3fb1be1ceb2723466a830746ab0e4b24eaf199f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maciej Żenczykowski 2024-01-25 05:52:16 +00:00 • committed by Automerger Merge Worker
commit 8bbefa9bac
9 changed files with 925 additions and 498 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Tethering/Android.bp
View file

@ -104,6 +104,7 @@ android_library {
lint: {
strict_updatability_linting: true,
baseline_filename: "lint-baseline.xml",
},
}
@ -122,6 +123,7 @@ android_library {
lint: {
strict_updatability_linting: true,
baseline_filename: "lint-baseline.xml",
},
}
@ -215,7 +217,7 @@ android_app {
apex_available: ["com.android.tethering"],
lint: {
strict_updatability_linting: true,
baseline_filename: "lint-baseline.xml",
},
}
@ -235,7 +237,7 @@ android_app {
lint: {
strict_updatability_linting: true,
error_checks: ["NewApi"],
baseline_filename: "lint-baseline.xml",
},
}
@ -263,9 +265,6 @@ java_library_static {
static_libs: ["tetheringprotos"],
apex_available: ["com.android.tethering"],
min_sdk_version: "30",
lint: {
baseline_filename: "lint-baseline.xml",
},
}
genrule {

4
Tethering/lint-baseline.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.0.0-dev" type="baseline" dependencies="true" variant="all" version="8.0.0-dev">
<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" variant="all" version="8.4.0-alpha01">
<issue
id="NewApi"
@ -8,7 +8,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/Tethering/src/com/android/networkstack/tethering/OffloadController.java"
line="293"
line="283"
column="44"/>
</issue>

12
framework/Android.bp
View file

@ -139,9 +139,6 @@ java_library {
"framework-wifi.stubs.module_lib",
],
visibility: ["//packages/modules/Connectivity:__subpackages__"],
lint: {
baseline_filename: "lint-baseline.xml",
},
}
java_defaults {
@ -259,9 +256,6 @@ java_library {
apex_available: [
"com.android.tethering",
],
lint: {
baseline_filename: "lint-baseline.xml",
},
}
java_genrule {
@ -322,9 +316,6 @@ droidstubs {
java_library {
name: "framework-connectivity-module-api-stubs-including-flagged",
srcs: [":framework-connectivity-module-api-stubs-including-flagged-droidstubs"],
lint: {
baseline_filename: "lint-baseline.xml",
},
}
// Library providing limited APIs within the connectivity module, so that R+ components like
@ -349,7 +340,4 @@ java_library {
visibility: [
"//packages/modules/Connectivity/Tethering:__subpackages__",
],
lint: {
baseline_filename: "lint-baseline.xml",
},
}

417
framework/lint-baseline.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.0.0-dev" type="baseline" dependencies="true" variant="all" version="8.0.0-dev">
<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" variant="all" version="8.4.0-alpha01">
<issue
id="NewApi"
@ -8,54 +8,10 @@
errorLine2=" ~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java"
line="2456"
line="2490"
column="71"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `android.net.Proxy#setHttpProxyConfiguration`"
errorLine1=" Proxy.setHttpProxyConfiguration(getInstance().getDefaultProxy());"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java"
line="5323"
column="23"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `android.os.Build#isDebuggable`"
errorLine1=" if (!Build.isDebuggable()) {"
errorLine2=" ~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/ConnectivitySettingsManager.java"
line="1072"
column="24"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `android.os.UserHandle#getUid`"
errorLine1=" final int end = nextUser.getUid(0 /* appId */) - 1;"
errorLine2=" ~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/UidRange.java"
line="50"
column="34"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `android.os.UserHandle#getUid`"
errorLine1=" final int start = user.getUid(0 /* appId */);"
errorLine2=" ~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/UidRange.java"
line="49"
column="32"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `android.provider.Settings#checkAndNoteWriteSettingsOperation`"
@ -63,10 +19,21 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java"
line="2799"
line="2853"
column="25"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `android.net.Proxy#setHttpProxyConfiguration`"
errorLine1=" Proxy.setHttpProxyConfiguration(getInstance().getDefaultProxy());"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java"
line="5422"
column="23"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `java.net.InetAddress#clearDnsCache`"
@ -74,10 +41,142 @@
errorLine2=" ~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java"
line="5329"
line="5428"
column="25"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.net.event.NetworkEventDispatcher#dispatchNetworkConfigurationChange`"
errorLine1=" NetworkEventDispatcher.getInstance().dispatchNetworkConfigurationChange();"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java"
line="5431"
column="50"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.net.event.NetworkEventDispatcher#getInstance`"
errorLine1=" NetworkEventDispatcher.getInstance().dispatchNetworkConfigurationChange();"
errorLine2=" ~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java"
line="5431"
column="36"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `android.os.Build#isDebuggable`"
errorLine1=" if (!Build.isDebuggable()) {"
errorLine2=" ~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/ConnectivitySettingsManager.java"
line="1095"
column="24"/>
</issue>
<issue
id="NewApi"
message="Field requires API level 31 (current min is 30): `android.system.OsConstants#ENONET`"
errorLine1=' new DnsException(ERROR_SYSTEM, new ErrnoException("resNetworkQuery", ENONET))));'
errorLine2=" ~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/DnsResolver.java"
line="367"
column="90"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.io.IoUtils#closeQuietly`"
errorLine1=" IoUtils.closeQuietly(socket);"
errorLine2=" ~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/util/DnsUtils.java"
line="181"
column="21"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.io.IoUtils#closeQuietly`"
errorLine1=" IoUtils.closeQuietly(socket);"
errorLine2=" ~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/util/DnsUtils.java"
line="373"
column="21"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.io.IoUtils#closeQuietly`"
errorLine1=" IoUtils.closeQuietly(is);"
errorLine2=" ~~~~~~~~~~~~">
<location
file="frameworks/base/core/java/com/android/internal/util/FileRotator.java"
line="171"
column="33"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.io.IoUtils#closeQuietly`"
errorLine1=" IoUtils.closeQuietly(zos);"
errorLine2=" ~~~~~~~~~~~~">
<location
file="frameworks/base/core/java/com/android/internal/util/FileRotator.java"
line="178"
column="21"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.io.IoUtils#closeQuietly`"
errorLine1=" IoUtils.closeQuietly(bis);"
errorLine2=" ~~~~~~~~~~~~">
<location
file="frameworks/base/core/java/com/android/internal/util/FileRotator.java"
line="401"
column="21"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.io.IoUtils#closeQuietly`"
errorLine1=" IoUtils.closeQuietly(bos);"
errorLine2=" ~~~~~~~~~~~~">
<location
file="frameworks/base/core/java/com/android/internal/util/FileRotator.java"
line="416"
column="21"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.net.InetAddressUtils#isNumericAddress`"
errorLine1=" return InetAddressUtils.isNumericAddress(address);"
errorLine2=" ~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/InetAddresses.java"
line="46"
column="33"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.net.InetAddressUtils#parseNumericAddress`"
errorLine1=" return InetAddressUtils.parseNumericAddress(address);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/InetAddresses.java"
line="63"
column="33"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `java.net.InetAddress#getAllByNameOnNet`"
@ -100,17 +199,6 @@
column="28"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.io.IoUtils#closeQuietly`"
errorLine1=" IoUtils.closeQuietly(is);"
errorLine2=" ~~~~~~~~~~~~">
<location
file="frameworks/base/core/java/com/android/internal/util/FileRotator.java"
line="168"
column="33"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.io.IoUtils#closeQuietly`"
@ -155,105 +243,6 @@
column="37"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.io.IoUtils#closeQuietly`"
errorLine1=" IoUtils.closeQuietly(bis);"
errorLine2=" ~~~~~~~~~~~~">
<location
file="frameworks/base/core/java/com/android/internal/util/FileRotator.java"
line="391"
column="21"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.io.IoUtils#closeQuietly`"
errorLine1=" IoUtils.closeQuietly(bos);"
errorLine2=" ~~~~~~~~~~~~">
<location
file="frameworks/base/core/java/com/android/internal/util/FileRotator.java"
line="406"
column="21"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.io.IoUtils#closeQuietly`"
errorLine1=" IoUtils.closeQuietly(socket);"
errorLine2=" ~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/util/DnsUtils.java"
line="181"
column="21"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.io.IoUtils#closeQuietly`"
errorLine1=" IoUtils.closeQuietly(socket);"
errorLine2=" ~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/util/DnsUtils.java"
line="373"
column="21"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.io.IoUtils#closeQuietly`"
errorLine1=" IoUtils.closeQuietly(zos);"
errorLine2=" ~~~~~~~~~~~~">
<location
file="frameworks/base/core/java/com/android/internal/util/FileRotator.java"
line="175"
column="21"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.net.InetAddressUtils#isNumericAddress`"
errorLine1=" return InetAddressUtils.isNumericAddress(address);"
errorLine2=" ~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/InetAddresses.java"
line="46"
column="33"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.net.InetAddressUtils#parseNumericAddress`"
errorLine1=" return InetAddressUtils.parseNumericAddress(address);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/InetAddresses.java"
line="63"
column="33"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.net.event.NetworkEventDispatcher#dispatchNetworkConfigurationChange`"
errorLine1=" NetworkEventDispatcher.getInstance().dispatchNetworkConfigurationChange();"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java"
line="5332"
column="50"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.net.event.NetworkEventDispatcher#getInstance`"
errorLine1=" NetworkEventDispatcher.getInstance().dispatchNetworkConfigurationChange();"
errorLine2=" ~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/ConnectivityManager.java"
line="5332"
column="36"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.net.http.HttpURLConnectionFactory#createInstance`"
@ -265,17 +254,6 @@
column="82"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.net.http.HttpURLConnectionFactory#openConnection`"
errorLine1=" return urlConnectionFactory.openConnection(url, socketFactory, proxy);"
errorLine2=" ~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/Network.java"
line="372"
column="37"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.net.http.HttpURLConnectionFactory#setDns`"
@ -300,35 +278,13 @@
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `new android.net.EthernetNetworkSpecifier`"
errorLine1=" return setNetworkSpecifier(new EthernetNetworkSpecifier(networkSpecifier));"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
message="Call requires API level 31 (current min is 30): `libcore.net.http.HttpURLConnectionFactory#openConnection`"
errorLine1=" return urlConnectionFactory.openConnection(url, socketFactory, proxy);"
errorLine2=" ~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/NetworkRequest.java"
line="525"
column="48"/>
</issue>
<issue
id="NewApi"
message="Cast from `EthernetNetworkSpecifier` to `NetworkSpecifier` requires API level 31 (current min is 30)"
errorLine1=" return setNetworkSpecifier(new EthernetNetworkSpecifier(networkSpecifier));"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/NetworkRequest.java"
line="525"
column="48"/>
</issue>
<issue
id="NewApi"
message="Class requires API level 31 (current min is 30): `android.telephony.data.EpsBearerQosSessionAttributes`"
errorLine1=" (EpsBearerQosSessionAttributes)attributes));"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/NetworkAgent.java"
line="1421"
column="22"/>
file="packages/modules/Connectivity/framework/src/android/net/Network.java"
line="372"
column="37"/>
</issue>
<issue
@ -338,18 +294,18 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/NetworkAgent.java"
line="1418"
line="1462"
column="35"/>
</issue>
<issue
id="NewApi"
message="Class requires API level 31 (current min is 30): `android.telephony.data.NrQosSessionAttributes`"
errorLine1=" (NrQosSessionAttributes)attributes));"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
message="Class requires API level 31 (current min is 30): `android.telephony.data.EpsBearerQosSessionAttributes`"
errorLine1=" (EpsBearerQosSessionAttributes)attributes));"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/NetworkAgent.java"
line="1425"
line="1465"
column="22"/>
</issue>
@ -360,8 +316,63 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/NetworkAgent.java"
line="1422"
line="1466"
column="42"/>
</issue>
<issue
id="NewApi"
message="Class requires API level 31 (current min is 30): `android.telephony.data.NrQosSessionAttributes`"
errorLine1=" (NrQosSessionAttributes)attributes));"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/NetworkAgent.java"
line="1469"
column="22"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `new android.net.EthernetNetworkSpecifier`"
errorLine1=" return setNetworkSpecifier(new EthernetNetworkSpecifier(networkSpecifier));"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/NetworkRequest.java"
line="553"
column="48"/>
</issue>
<issue
id="NewApi"
message="Cast from `EthernetNetworkSpecifier` to `NetworkSpecifier` requires API level 31 (current min is 30)"
errorLine1=" return setNetworkSpecifier(new EthernetNetworkSpecifier(networkSpecifier));"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/NetworkRequest.java"
line="553"
column="48"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `android.os.UserHandle#getUid`"
errorLine1=" final int start = user.getUid(0 /* appId */);"
errorLine2=" ~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/UidRange.java"
line="49"
column="32"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `android.os.UserHandle#getUid`"
errorLine1=" final int end = nextUser.getUid(0 /* appId */) - 1;"
errorLine2=" ~~~~~~">
<location
file="packages/modules/Connectivity/framework/src/android/net/UidRange.java"
line="50"
column="34"/>
</issue>
</issues>

4
nearby/service/lint-baseline.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.0.0-dev" type="baseline" dependencies="true" variant="all" version="8.0.0-dev">
<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" variant="all" version="8.4.0-alpha01">
<issue
id="NewApi"
@ -8,7 +8,7 @@
errorLine2=" ~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/nearby/service/java/com/android/server/nearby/provider/ChreCommunication.java"
line="263"
line="289"
column="54"/>
</issue>

2
service-t/Android.bp
View file

@ -98,7 +98,7 @@ java_library {
min_sdk_version: "21",
lint: {
error_checks: ["NewApi"],
baseline_filename: "lint-baseline.xml",
},
srcs: [
"src/com/android/server/connectivity/mdns/**/*.java",

345
service-t/lint-baseline.xml
View file

@ -1,103 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.0.0-dev" type="baseline" dependencies="true" variant="all" version="8.0.0-dev">
<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" variant="all" version="8.4.0-alpha01">
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `android.net.EthernetNetworkSpecifier#getInterfaceName`"
errorLine1=" if (!((EthernetNetworkSpecifier) spec).getInterfaceName().matches(iface)) {"
errorLine2=" ~~~~~~~~~~~~~~~~">
message="Call requires API level 31 (current min is 30): `BpfMap`"
errorLine1=" return new BpfMap&lt;&gt;(IFACE_INDEX_NAME_MAP_PATH, BpfMap.BPF_F_RDWR,"
errorLine2=" ~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java"
line="224"
column="48"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `android.net.UnderlyingNetworkInfo#getInterface`"
errorLine1=" delta.migrateTun(info.getOwnerUid(), info.getInterface(),"
errorLine2=" ~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/net/NetworkStatsFactory.java"
line="276"
column="55"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `android.net.UnderlyingNetworkInfo#getOwnerUid`"
errorLine1=" delta.migrateTun(info.getOwnerUid(), info.getInterface(),"
errorLine2=" ~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/net/NetworkStatsFactory.java"
line="276"
column="35"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `android.net.UnderlyingNetworkInfo#getUnderlyingInterfaces`"
errorLine1=" info.getUnderlyingInterfaces());"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/net/NetworkStatsFactory.java"
line="277"
column="26"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `java.net.InetAddress#parseNumericAddress`"
errorLine1=" dnsAddresses.add(InetAddress.parseNumericAddress(address));"
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/ethernet/EthernetTracker.java"
line="875"
column="54"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `java.net.InetAddress#parseNumericAddress`"
errorLine1=" staticIpConfigBuilder.setGateway(InetAddress.parseNumericAddress(value));"
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/ethernet/EthernetTracker.java"
line="870"
column="66"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.io.IoUtils#closeQuietly`"
errorLine1=" IoUtils.closeQuietly(os);"
errorLine2=" ~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/net/NetworkStatsRecorder.java"
line="556"
column="25"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.io.IoUtils#closeQuietly`"
errorLine1=" IoUtils.closeQuietly(sockFd);"
errorLine2=" ~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/IpSecService.java"
line="1309"
column="25"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.io.IoUtils#closeQuietly`"
errorLine1=" IoUtils.closeQuietly(mSocket);"
errorLine2=" ~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/IpSecService.java"
line="1034"
column="21"/>
file="packages/modules/Connectivity/service-t/src/com/android/server/net/BpfInterfaceMapUpdater.java"
line="69"
column="24"/>
</issue>
<issue
@ -111,6 +23,17 @@
column="38"/>
</issue>
<issue
id="NewApi"
message="Cast from `EthernetNetworkSpecifier` to `NetworkSpecifier` requires API level 31 (current min is 30)"
errorLine1=" .setNetworkSpecifier(new EthernetNetworkSpecifier(ifaceName))"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java"
line="156"
column="38"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `new android.net.EthernetNetworkSpecifier`"
@ -122,39 +45,6 @@
column="36"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `new android.util.AtomicFile`"
errorLine1=" mFile = new AtomicFile(new File(path), logger);"
errorLine2=" ~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/net/PersistentInt.java"
line="53"
column="17"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `new java.net.InetSocketAddress`"
errorLine1=" super(handler, new RecvBuffer(buffer, new InetSocketAddress()));"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/connectivity/mdns/MulticastPacketReader.java"
line="66"
column="47"/>
</issue>
<issue
id="NewApi"
message="Cast from `EthernetNetworkSpecifier` to `NetworkSpecifier` requires API level 31 (current min is 30)"
errorLine1=" .setNetworkSpecifier(new EthernetNetworkSpecifier(ifaceName))"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java"
line="156"
column="38"/>
</issue>
<issue
id="NewApi"
message="Cast from `EthernetNetworkSpecifier` to `NetworkSpecifier` requires API level 31 (current min is 30)"
@ -166,6 +56,28 @@
column="36"/>
</issue>
<issue
id="NewApi"
message="Class requires API level 31 (current min is 30): `android.net.EthernetNetworkSpecifier`"
errorLine1=" if (!(spec instanceof EthernetNetworkSpecifier)) {"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java"
line="221"
column="31"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `android.net.EthernetNetworkSpecifier#getInterfaceName`"
errorLine1=" if (!((EthernetNetworkSpecifier) spec).getInterfaceName().matches(iface)) {"
errorLine2=" ~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java"
line="224"
column="48"/>
</issue>
<issue
id="NewApi"
message="Class requires API level 31 (current min is 30): `android.net.EthernetNetworkSpecifier`"
@ -179,13 +91,178 @@
<issue
id="NewApi"
message="Class requires API level 31 (current min is 30): `android.net.EthernetNetworkSpecifier`"
errorLine1=" if (!(spec instanceof EthernetNetworkSpecifier)) {"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
message="Call requires API level 31 (current min is 30): `java.net.InetAddress#parseNumericAddress`"
errorLine1=" staticIpConfigBuilder.setGateway(InetAddress.parseNumericAddress(value));"
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java"
line="221"
column="31"/>
file="packages/modules/Connectivity/service-t/src/com/android/server/ethernet/EthernetTracker.java"
line="885"
column="66"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `java.net.InetAddress#parseNumericAddress`"
errorLine1=" dnsAddresses.add(InetAddress.parseNumericAddress(address));"
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/ethernet/EthernetTracker.java"
line="890"
column="54"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.io.IoUtils#closeQuietly`"
errorLine1=" IoUtils.closeQuietly(mSocket);"
errorLine2=" ~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/IpSecService.java"
line="1042"
column="21"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.io.IoUtils#closeQuietly`"
errorLine1=" IoUtils.closeQuietly(sockFd);"
errorLine2=" ~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/IpSecService.java"
line="1318"
column="25"/>
</issue>
<issue
id="NewApi"
message="Field requires API level 31 (current min is 30): `android.system.OsConstants#UDP_ENCAP`"
errorLine1=" OsConstants.UDP_ENCAP,"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/IpSecService.java"
line="1326"
column="21"/>
</issue>
<issue
id="NewApi"
message="Field requires API level 31 (current min is 30): `android.system.OsConstants#UDP_ENCAP_ESPINUDP`"
errorLine1=" OsConstants.UDP_ENCAP_ESPINUDP);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/IpSecService.java"
line="1327"
column="21"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 33 (current min is 30): `BpfNetMaps`"
errorLine1=" return new BpfNetMaps(ctx);"
errorLine2=" ~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/net/NetworkStatsFactory.java"
line="111"
column="20"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 33 (current min is 30): `swapActiveStatsMap`"
errorLine1=" mBpfNetMaps.swapActiveStatsMap();"
errorLine2=" ~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/net/NetworkStatsFactory.java"
line="185"
column="25"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `android.net.UnderlyingNetworkInfo#getInterface`"
errorLine1=" delta.migrateTun(info.getOwnerUid(), info.getInterface(),"
errorLine2=" ~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/net/NetworkStatsFactory.java"
line="240"
column="55"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `android.net.UnderlyingNetworkInfo#getOwnerUid`"
errorLine1=" delta.migrateTun(info.getOwnerUid(), info.getInterface(),"
errorLine2=" ~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/net/NetworkStatsFactory.java"
line="240"
column="35"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `android.net.UnderlyingNetworkInfo#getUnderlyingInterfaces`"
errorLine1=" info.getUnderlyingInterfaces());"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/net/NetworkStatsFactory.java"
line="241"
column="26"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `libcore.io.IoUtils#closeQuietly`"
errorLine1=" IoUtils.closeQuietly(os);"
errorLine2=" ~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/net/NetworkStatsRecorder.java"
line="580"
column="25"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 35 (current min is 34): `newInstance`"
errorLine1=" opts = BroadcastOptionsShimImpl.newInstance("
errorLine2=" ~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/net/NetworkStatsService.java"
line="562"
column="61"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 30): `new android.util.AtomicFile`"
errorLine1=" mFile = new AtomicFile(new File(path), logger);"
errorLine2=" ~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/net/PersistentInt.java"
line="53"
column="17"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 33 (current min is 30): `addOrUpdateInterfaceAddress`"
errorLine1=" mCb.addOrUpdateInterfaceAddress(ifaddrMsg.index, la);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/connectivity/mdns/internal/SocketNetlinkMonitor.java"
line="69"
column="25"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 33 (current min is 30): `deleteInterfaceAddress`"
errorLine1=" mCb.deleteInterfaceAddress(ifaddrMsg.index, la);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
<location
file="packages/modules/Connectivity/service-t/src/com/android/server/connectivity/mdns/internal/SocketNetlinkMonitor.java"
line="73"
column="21"/>
</issue>
</issues>

15
service/Android.bp
View file

@ -70,9 +70,6 @@ java_library {
apex_available: [
"com.android.tethering",
],
lint: {
baseline_filename: "lint-baseline.xml",
},
}
// The library name match the service-connectivity jarjar rules that put the JNI utils in the
@ -206,6 +203,7 @@ java_library {
lint: {
strict_updatability_linting: true,
baseline_filename: "lint-baseline.xml",
},
visibility: [
"//packages/modules/Connectivity/service-t",
@ -231,7 +229,7 @@ java_library {
],
lint: {
strict_updatability_linting: true,
baseline_filename: "lint-baseline.xml",
},
}
@ -290,18 +288,12 @@ java_defaults {
java_library {
name: "service-connectivity-for-tests",
defaults: ["service-connectivity-defaults"],
lint: {
baseline_filename: "lint-baseline.xml",
},
}
java_library {
name: "service-connectivity",
defaults: ["service-connectivity-defaults"],
installable: true,
lint: {
baseline_filename: "lint-baseline.xml",
},
}
java_library_static {
@ -316,9 +308,6 @@ java_library_static {
],
static_libs: ["ConnectivityServiceprotos"],
apex_available: ["com.android.tethering"],
lint: {
baseline_filename: "lint-baseline.xml",
},
}
genrule {

1199
service/lint-baseline.xml
View file

File diff suppressed because it is too large Load diff