commit 2f5bb0a27652e2ffc49a7d56ce1afd702074a11f
author Xiao Ma <xiaom@google.com> Wed Dec 22 02:24:39 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 22 02:24:39 2021 +0000
tree a4066c37db8e59f122d88489c06eaddcc6a4505b
parent 7b84ce8042b7cca2332aff6ddf29c3c1f16e5c17
parent 9316b296b46953310514fd5d39e6aaba35b5cc40

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

service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java

diff --git a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
index fc26a6c..53928f7 100644
--- a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -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 @@
                 @NonNull NetworkCapabilities capabilities, NetworkFactory networkFactory,
                 Dependencies deps) {
             name = ifaceName;
-            mCapabilities = checkNotNull(capabilities);
+            mCapabilities = Objects.requireNonNull(capabilities);
             mHandler = handler;
             mContext = context;
             mNetworkFactory = networkFactory;