LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add @SupressLint to get around incorrect warning.

Browse Source 
EthernetNetworkSpecifier is being moved from being @SystemApi to public.
This is causing the linter to incorrectly throw errors when building on
erro prone. Add @SupressLint to the method causing the errors prevents
the incorrect warning from causing build failures.

Tracking bug b/193460475 - TODO to remove once fixed.

cherry pick of http://ag/16822701

Bug: 210485380
Test: build errorprone
Change-Id: Id297e739a2288ccc232c6b989ec7fee41837a910
Merged-In: Id297e739a2288ccc232c6b989ec7fee41837a910
This commit is contained in:
James Mattis
2022-02-08 19:18:48 -08:00
parent 34e16b9537
commit d8afb66b11
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
framework/src/android/net/NetworkRequest.java
View File

@@ -423,6 +423,7 @@ public class NetworkRequest implements Parcelable {
*
* @deprecated Use {@link #setNetworkSpecifier(NetworkSpecifier)} instead.
*/
@SuppressLint("NewApi") // TODO: b/193460475 remove once fixed
@Deprecated
public Builder setNetworkSpecifier(String networkSpecifier) {
try {
@@ -439,6 +440,15 @@ public class NetworkRequest implements Parcelable {
} else if (mNetworkCapabilities.hasTransport(TRANSPORT_TEST)) {
return setNetworkSpecifier(new TestNetworkSpecifier(networkSpecifier));
} else {
// TODO: b/193460475 remove comment once fixed
// @SuppressLint("NewApi") is due to EthernetNetworkSpecifier being changed
// from @SystemApi to public. EthernetNetworkSpecifier was introduced in Android
// 12 as @SystemApi(client = MODULE_LIBRARIES) and made public in Android 13.
// b/193460475 means in the above situation the tools will think
// EthernetNetworkSpecifier didn't exist in Android 12, causing the NewApi lint
// to fail. In this case, this is actually safe because this code was
// modularized in Android 12, so it can't run on SDKs before Android 12 and is
// therefore guaranteed to always have this class available to it.
return setNetworkSpecifier(new EthernetNetworkSpecifier(networkSpecifier));
}
}