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

Merge "Add @SupressLint to get around incorrect warning."

Browse Source
This commit is contained in:
James Mattis
2022-02-10 22:26:06 +00:00
committed by Gerrit Code Review
parent 0fc2ec6d68 d8afb66b11
commit 38872800dd
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. * @deprecated Use {@link #setNetworkSpecifier(NetworkSpecifier)} instead.
*/ */
@SuppressLint("NewApi") // TODO: b/193460475 remove once fixed
@Deprecated @Deprecated
public Builder setNetworkSpecifier(String networkSpecifier) { public Builder setNetworkSpecifier(String networkSpecifier) {
try { try {
@@ -439,6 +440,15 @@ public class NetworkRequest implements Parcelable {
} else if (mNetworkCapabilities.hasTransport(TRANSPORT_TEST)) { } else if (mNetworkCapabilities.hasTransport(TRANSPORT_TEST)) {
return setNetworkSpecifier(new TestNetworkSpecifier(networkSpecifier)); return setNetworkSpecifier(new TestNetworkSpecifier(networkSpecifier));
} else { } 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)); return setNetworkSpecifier(new EthernetNetworkSpecifier(networkSpecifier));
} }
} }