Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d51b95bf authored by markchien's avatar markchien Committed by Mark Chien
Browse files

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
Change-Id: I693d0318fa4f1afbc220aa7c43e614ab5714a984
parent 4ee76530

common/moduleutils/src/android/net/util/InterfaceParams.java

+6 −4
Original line number Original line Diff line number Diff line
@@ -16,8 +16,6 @@ 




package android.net.util;

package android.net.util;





import static com.android.internal.util.Preconditions.checkArgument;



import android.net.MacAddress;

import android.net.MacAddress;

import android.text.TextUtils;

import android.text.TextUtils;
@@ -66,8 +64,12 @@ public class InterfaceParams { 
    }

    }





    public InterfaceParams(String name, int index, MacAddress macAddr, int defaultMtu) {

    public InterfaceParams(String name, int index, MacAddress macAddr, int defaultMtu) {

        checkArgument((!TextUtils.isEmpty(name)), "impossible interface name");

        if (TextUtils.isEmpty(name)) {

        checkArgument((index > 0), "invalid interface index");

            throw new IllegalArgumentException("impossible interface name");

        }



        if (index <= 0) throw new IllegalArgumentException("invalid interface index");



        this.name = name;

        this.name = name;

        this.index = index;

        this.index = index;

        this.hasMacAddress = (macAddr != null);

        this.hasMacAddress = (macAddr != null);

src/android/net/ip/IpClient.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -74,7 +74,6 @@ import com.android.internal.util.HexDump; 
import com.android.internal.util.IState;

import com.android.internal.util.IState;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.MessageUtils;

import com.android.internal.util.MessageUtils;

import com.android.internal.util.Preconditions;

import com.android.internal.util.State;

import com.android.internal.util.State;

import com.android.internal.util.StateMachine;

import com.android.internal.util.StateMachine;

import com.android.internal.util.WakeupMessage;

import com.android.internal.util.WakeupMessage;
@@ -549,8 +548,8 @@ public class IpClient extends StateMachine { 
            NetworkObserverRegistry observerRegistry, NetworkStackServiceManager nssManager,

            NetworkObserverRegistry observerRegistry, NetworkStackServiceManager nssManager,

            Dependencies deps) {

            Dependencies deps) {

        super(IpClient.class.getSimpleName() + "." + ifName);

        super(IpClient.class.getSimpleName() + "." + ifName);

        Preconditions.checkNotNull(ifName);

        Objects.requireNonNull(ifName);

        Preconditions.checkNotNull(callback);

        Objects.requireNonNull(callback);





        mTag = getName();

        mTag = getName();