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

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

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

View File

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