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

API: Suppress existing NullableCollections lints am: 14c08d26d5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d47151b7e26e82706f2d94a13c4067fe71fc168
This commit is contained in:
Adrian Roos
2021-02-04 16:19:34 +00:00
committed by Automerger Merge Worker
parent 74126b9bb0 14c08d26d5
commit 015da1beca
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/src/android/net/NetworkAgent.java
View File

@@ -20,6 +20,7 @@ import android.annotation.IntDef;
import android.annotation.IntRange; import android.annotation.IntRange;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SuppressLint;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context; import android.content.Context;
@@ -775,7 +776,8 @@ public abstract class NetworkAgent {
* @param underlyingNetworks the new list of underlying networks. * @param underlyingNetworks the new list of underlying networks.
* @see {@link VpnService.Builder#setUnderlyingNetworks(Network[])} * @see {@link VpnService.Builder#setUnderlyingNetworks(Network[])}
*/ */
public final void setUnderlyingNetworks(@Nullable List<Network> underlyingNetworks) { public final void setUnderlyingNetworks(
@SuppressLint("NullableCollection") @Nullable List<Network> underlyingNetworks) {
final ArrayList<Network> underlyingArray = (underlyingNetworks != null) final ArrayList<Network> underlyingArray = (underlyingNetworks != null)
? new ArrayList<>(underlyingNetworks) : null; ? new ArrayList<>(underlyingNetworks) : null;
queueOrSendMessage(reg -> reg.sendUnderlyingNetworks(underlyingArray)); queueOrSendMessage(reg -> reg.sendUnderlyingNetworks(underlyingArray));