Merge "Replace Preconditions.checkNotNull with Objects.requireNonNull." am: 7ab9fb8f1a am: 9316b296b4

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1927229

Change-Id: I1ac05f9af8a3f07bcf0c66dfa66ec2dafcc8f74b
This commit is contained in:
Xiao Ma
2021-12-22 02:24:39 +00:00
committed by Automerger Merge Worker

View File

@@ -16,8 +16,6 @@
package com.android.server.ethernet; package com.android.server.ethernet;
import static com.android.internal.util.Preconditions.checkNotNull;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.content.Context; import android.content.Context;
@@ -370,7 +368,7 @@ public class EthernetNetworkFactory extends NetworkFactory {
@NonNull NetworkCapabilities capabilities, NetworkFactory networkFactory, @NonNull NetworkCapabilities capabilities, NetworkFactory networkFactory,
Dependencies deps) { Dependencies deps) {
name = ifaceName; name = ifaceName;
mCapabilities = checkNotNull(capabilities); mCapabilities = Objects.requireNonNull(capabilities);
mHandler = handler; mHandler = handler;
mContext = context; mContext = context;
mNetworkFactory = networkFactory; mNetworkFactory = networkFactory;