From ca1eaf28862e3ae279d6567c3ed888c8e607f81d Mon Sep 17 00:00:00 2001 From: Mark Chien Date: Mon, 27 Apr 2020 11:17:28 +0000 Subject: Remove Preconditions usage from moduleutils and IpClient moduleutils is a shared utility to be used by multiple network modules. Stop depending on a framework private class usage. Then all of its users can stop depending on the statically linked and jarjared private framework class. Bug: 148636687 Test: atest TetheringTests NetworkStackNextTests Merged-In: I693d0318fa4f1afbc220aa7c43e614ab5714a984 Change-Id: I693d0318fa4f1afbc220aa7c43e614ab5714a984 --- src/android/net/ip/IpClient.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/android/net/ip/IpClient.java') diff --git a/src/android/net/ip/IpClient.java b/src/android/net/ip/IpClient.java index 86d3ba7..b01dfe8 100644 --- a/src/android/net/ip/IpClient.java +++ b/src/android/net/ip/IpClient.java @@ -74,7 +74,6 @@ import com.android.internal.util.HexDump; import com.android.internal.util.IState; import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.MessageUtils; -import com.android.internal.util.Preconditions; import com.android.internal.util.State; import com.android.internal.util.StateMachine; import com.android.internal.util.WakeupMessage; @@ -549,8 +548,8 @@ public class IpClient extends StateMachine { NetworkObserverRegistry observerRegistry, NetworkStackServiceManager nssManager, Dependencies deps) { super(IpClient.class.getSimpleName() + "." + ifName); - Preconditions.checkNotNull(ifName); - Preconditions.checkNotNull(callback); + Objects.requireNonNull(ifName); + Objects.requireNonNull(callback); mTag = getName(); -- cgit v1.2.3