From 31ce0a1dc7af27a9547afea88c5e4e115c87132a Mon Sep 17 00:00:00 2001
From: Xiao Ma <xiaom@google.com>
Date: Tue, 21 Dec 2021 07:09:39 +0000
Subject: [PATCH] Replace Preconditions.checkNotNull with
 Objects.requireNonNull.

Ethernet service related files are going to be moved into Connectivity
mainline module. Replace the Preconditions.checkNotNull usage in
EthernetNetworkFactory with Objects.requireNonNull.

Bug: 210586283
Test: atest EthernetServiceTests
Change-Id: Ibeaf687f706e8400f825cb2ca97bb1341774a97d
---
 .../com/android/server/ethernet/EthernetNetworkFactory.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
index 2886cf1e3d..a9f8b47fa1 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 @@ 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;