Skip to content
Snippets Groups Projects
Commit 03be33bd authored by Motomu Utsumi's avatar Motomu Utsumi Committed by Automerger Merge Worker
Browse files

Merge "Remove lint-baseline in staticlibs" into main am: 30ef5308 

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



Change-Id: I5ea1221f7d79bd3b5c6df36980737b8878693451
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bbf74da2 30ef5308
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
staticlibs/Android.bp
+ 36
− 9
View file @ 03be33bd
......@@ -74,7 +74,10 @@ java_library {
"framework-configinfrastructure",
"framework-connectivity.stubs.module_lib",
],
lint: { strict_updatability_linting: true },
lint: {
strict_updatability_linting: true,
error_checks: ["NewApi"],
},
}
java_defaults {
......@@ -141,7 +144,10 @@ java_library {
"com.android.tethering",
"//apex_available:platform",
],
lint: { strict_updatability_linting: true },
lint: {
strict_updatability_linting: true,
error_checks: ["NewApi"],
},
}
java_library {
......@@ -169,7 +175,10 @@ java_library {
"com.android.tethering",
"//apex_available:platform",
],
lint: { strict_updatability_linting: true },
lint: {
strict_updatability_linting: true,
error_checks: ["NewApi"],
},
}
java_library {
......@@ -194,7 +203,10 @@ java_library {
"com.android.tethering",
"//apex_available:platform",
],
lint: { strict_updatability_linting: true },
lint: {
strict_updatability_linting: true,
error_checks: ["NewApi"],
},
}
java_library {
......@@ -223,7 +235,10 @@ java_library {
"com.android.tethering",
"//apex_available:platform",
],
lint: { strict_updatability_linting: true },
lint: {
strict_updatability_linting: true,
error_checks: ["NewApi"],
},
}
java_library {
......@@ -258,7 +273,10 @@ java_library {
"//packages/modules/Wifi/framework/tests:__subpackages__",
"//packages/apps/Settings",
],
lint: { strict_updatability_linting: true },
lint: {
strict_updatability_linting: true,
error_checks: ["NewApi"],
},
errorprone: {
enabled: true,
// Error-prone checking only warns of problems when building. To make the build fail with
......@@ -301,7 +319,10 @@ java_library {
"//packages/modules/Bluetooth/android/app",
"//packages/modules/Wifi/service:__subpackages__",
],
lint: { strict_updatability_linting: true },
lint: {
strict_updatability_linting: true,
error_checks: ["NewApi"],
},
}
java_library {
......@@ -323,7 +344,10 @@ java_library {
"com.android.tethering",
"//apex_available:platform",
],
lint: { strict_updatability_linting: true },
lint: {
strict_updatability_linting: true,
error_checks: ["NewApi"],
},
}
java_library {
......@@ -346,7 +370,10 @@ java_library {
"com.android.tethering",
"//apex_available:platform",
],
lint: { strict_updatability_linting: true },
lint: {
strict_updatability_linting: true,
error_checks: ["NewApi"],
},
}
// Limited set of utilities for use by service-connectivity-mdns-standalone-build-test, to make sure
......
staticlibs/device/com/android/net/module/util/SocketUtils.java
+ 3
− 1
View file @ 03be33bd
......@@ -19,6 +19,8 @@ package com.android.net.module.util;
import static android.net.util.SocketUtils.closeSocket;
import android.annotation.NonNull;
import android.annotation.RequiresApi;
import android.os.Build;
import android.system.NetlinkSocketAddress;
import java.io.FileDescriptor;
......@@ -39,7 +41,7 @@ public class SocketUtils {
/**
* Make a socket address to communicate with netlink.
*/
@NonNull
@NonNull @RequiresApi(Build.VERSION_CODES.S)
public static SocketAddress makeNetlinkSocketAddress(int portId, int groupsMask) {
return new NetlinkSocketAddress(portId, groupsMask);
}
......
staticlibs/lint-baseline.xml deleted 100644 → 0
+ 0
− 70
View file @ bbf74da2
<?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">
<issue
id="NewApi"
message="Call requires API level 30 (current min is 29): `android.net.LinkProperties#getAddresses`"
errorLine1=" final Collection&lt;InetAddress&gt; leftAddresses = left.getAddresses();"
errorLine2=" ~~~~~~~~~~~~">
<location
file="frameworks/libs/net/common/framework/com/android/net/module/util/LinkPropertiesUtils.java"
line="158"
column="60"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 30 (current min is 29): `android.net.LinkProperties#getAddresses`"
errorLine1=" final Collection&lt;InetAddress&gt; rightAddresses = right.getAddresses();"
errorLine2=" ~~~~~~~~~~~~">
<location
file="frameworks/libs/net/common/framework/com/android/net/module/util/LinkPropertiesUtils.java"
line="159"
column="62"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 30 (current min is 29): `android.net.NetworkStats#addEntry`"
errorLine1=" stats = stats.addEntry(entry);"
errorLine2=" ~~~~~~~~">
<location
file="frameworks/libs/net/common/framework/com/android/net/module/util/NetworkStatsUtils.java"
line="113"
column="27"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 30 (current min is 29): `new android.net.NetworkStats.Entry`"
errorLine1=" return new android.net.NetworkStats.Entry("
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="frameworks/libs/net/common/framework/com/android/net/module/util/NetworkStatsUtils.java"
line="120"
column="16"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 30 (current min is 29): `new android.net.NetworkStats`"
errorLine1=" android.net.NetworkStats stats = new android.net.NetworkStats(0L, 0);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="frameworks/libs/net/common/framework/com/android/net/module/util/NetworkStatsUtils.java"
line="108"
column="42"/>
</issue>
<issue
id="NewApi"
message="Call requires API level 31 (current min is 29): `new android.system.NetlinkSocketAddress`"
errorLine1=" return new NetlinkSocketAddress(portId, groupsMask);"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="frameworks/libs/net/common/device/com/android/net/module/util/SocketUtils.java"
line="44"
column="16"/>
</issue>
</issues>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment