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

Commit 636397a6 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" into sc-dev

parents 698a5294 37703094

packages/Connectivity/framework/src/android/net/ConnectivityDiagnosticsManager.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -28,7 +28,6 @@ import android.os.PersistableBundle; 
import android.os.RemoteException;

import android.os.RemoteException;





import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.Preconditions;





import java.lang.annotation.Retention;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.RetentionPolicy;
@@ -70,8 +69,8 @@ public class ConnectivityDiagnosticsManager { 




    /** @hide */

    /** @hide */

    public ConnectivityDiagnosticsManager(Context context, IConnectivityManager service) {

    public ConnectivityDiagnosticsManager(Context context, IConnectivityManager service) {

        mContext = Preconditions.checkNotNull(context, "missing context");

        mContext = Objects.requireNonNull(context, "missing context");

        mService = Preconditions.checkNotNull(service, "missing IConnectivityManager");

        mService = Objects.requireNonNull(service, "missing IConnectivityManager");

    }

    }





    /** @hide */

    /** @hide */

packages/Connectivity/framework/src/android/net/ConnectivityManager.java

+28 −20
Original line number Original line Diff line number Diff line
@@ -75,7 +75,6 @@ import android.util.SparseIntArray; 




import com.android.connectivity.aidl.INetworkAgent;

import com.android.connectivity.aidl.INetworkAgent;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.Preconditions;





import libcore.net.event.NetworkEventDispatcher;

import libcore.net.event.NetworkEventDispatcher;
@@ -1775,7 +1774,9 @@ public class ConnectivityManager { 
        // Map from type to transports.

        // Map from type to transports.

        final int NOT_FOUND = -1;

        final int NOT_FOUND = -1;

        final int transport = sLegacyTypeToTransport.get(type, NOT_FOUND);

        final int transport = sLegacyTypeToTransport.get(type, NOT_FOUND);

        Preconditions.checkArgument(transport != NOT_FOUND, "unknown legacy type: " + type);

        if (transport == NOT_FOUND) {

            throw new IllegalArgumentException("unknown legacy type: " + type);

        }

        nc.addTransportType(transport);

        nc.addTransportType(transport);





        // Map from type to capabilities.

        // Map from type to capabilities.
@@ -1880,8 +1881,8 @@ public class ConnectivityManager { 
        }

        }





        private PacketKeepalive(Network network, PacketKeepaliveCallback callback) {

        private PacketKeepalive(Network network, PacketKeepaliveCallback callback) {

            Preconditions.checkNotNull(network, "network cannot be null");

            Objects.requireNonNull(network, "network cannot be null");

            Preconditions.checkNotNull(callback, "callback cannot be null");

            Objects.requireNonNull(callback, "callback cannot be null");

            mNetwork = network;

            mNetwork = network;

            mExecutor = Executors.newSingleThreadExecutor();

            mExecutor = Executors.newSingleThreadExecutor();

            mCallback = new ISocketKeepaliveCallback.Stub() {

            mCallback = new ISocketKeepaliveCallback.Stub() {
@@ -2256,7 +2257,9 @@ public class ConnectivityManager { 
     */

     */

    public void removeDefaultNetworkActiveListener(@NonNull OnNetworkActiveListener l) {

    public void removeDefaultNetworkActiveListener(@NonNull OnNetworkActiveListener l) {

        INetworkActivityListener rl = mNetworkActivityListeners.get(l);

        INetworkActivityListener rl = mNetworkActivityListeners.get(l);

        Preconditions.checkArgument(rl != null, "Listener was not registered.");

        if (rl == null) {

            throw new IllegalArgumentException("Listener was not registered.");

        }

        try {

        try {

            mService.registerNetworkActivityListener(rl);

            mService.registerNetworkActivityListener(rl);

        } catch (RemoteException e) {

        } catch (RemoteException e) {
@@ -2284,8 +2287,8 @@ public class ConnectivityManager { 
     * {@hide}

     * {@hide}

     */

     */

    public ConnectivityManager(Context context, IConnectivityManager service) {

    public ConnectivityManager(Context context, IConnectivityManager service) {

        mContext = Preconditions.checkNotNull(context, "missing context");

        mContext = Objects.requireNonNull(context, "missing context");

        mService = Preconditions.checkNotNull(service, "missing IConnectivityManager");

        mService = Objects.requireNonNull(service, "missing IConnectivityManager");

        mTetheringManager = (TetheringManager) mContext.getSystemService(Context.TETHERING_SERVICE);

        mTetheringManager = (TetheringManager) mContext.getSystemService(Context.TETHERING_SERVICE);

        sInstance = this;

        sInstance = this;

    }

    }
@@ -2552,7 +2555,7 @@ public class ConnectivityManager { 
    @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED)

    @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED)

    public void startTethering(int type, boolean showProvisioningUi,

    public void startTethering(int type, boolean showProvisioningUi,

            final OnStartTetheringCallback callback, Handler handler) {

            final OnStartTetheringCallback callback, Handler handler) {

        Preconditions.checkNotNull(callback, "OnStartTetheringCallback cannot be null.");

        Objects.requireNonNull(callback, "OnStartTetheringCallback cannot be null.");





        final Executor executor = new Executor() {

        final Executor executor = new Executor() {

            @Override

            @Override
@@ -2645,7 +2648,7 @@ public class ConnectivityManager { 
    public void registerTetheringEventCallback(

    public void registerTetheringEventCallback(

            @NonNull @CallbackExecutor Executor executor,

            @NonNull @CallbackExecutor Executor executor,

            @NonNull final OnTetheringEventCallback callback) {

            @NonNull final OnTetheringEventCallback callback) {

        Preconditions.checkNotNull(callback, "OnTetheringEventCallback cannot be null.");

        Objects.requireNonNull(callback, "OnTetheringEventCallback cannot be null.");





        final TetheringEventCallback tetherCallback =

        final TetheringEventCallback tetherCallback =

                new TetheringEventCallback() {

                new TetheringEventCallback() {
@@ -2943,7 +2946,7 @@ public class ConnectivityManager { 
    public void getLatestTetheringEntitlementResult(int type, boolean showEntitlementUi,

    public void getLatestTetheringEntitlementResult(int type, boolean showEntitlementUi,

            @NonNull @CallbackExecutor Executor executor,

            @NonNull @CallbackExecutor Executor executor,

            @NonNull final OnTetheringEntitlementResultListener listener) {

            @NonNull final OnTetheringEntitlementResultListener listener) {

        Preconditions.checkNotNull(listener, "TetheringEntitlementResultListener cannot be null.");

        Objects.requireNonNull(listener, "TetheringEntitlementResultListener cannot be null.");

        ResultReceiver wrappedListener = new ResultReceiver(null) {

        ResultReceiver wrappedListener = new ResultReceiver(null) {

            @Override

            @Override

            protected void onReceiveResult(int resultCode, Bundle resultData) {

            protected void onReceiveResult(int resultCode, Bundle resultData) {
@@ -3316,7 +3319,9 @@ public class ConnectivityManager { 
        }

        }





        public NetworkCallback(@Flag int flags) {

        public NetworkCallback(@Flag int flags) {

            Preconditions.checkArgument((flags & VALID_FLAGS) == flags);

            if ((flags & VALID_FLAGS) != flags) {

                throw new IllegalArgumentException("Invalid flags");

            }

            mFlags = flags;

            mFlags = flags;

        }

        }
@@ -3602,7 +3607,7 @@ public class ConnectivityManager { 
        }

        }





        CallbackHandler(Handler handler) {

        CallbackHandler(Handler handler) {

            this(Preconditions.checkNotNull(handler, "Handler cannot be null.").getLooper());

            this(Objects.requireNonNull(handler, "Handler cannot be null.").getLooper());

        }

        }





        @Override

        @Override
@@ -3700,9 +3705,9 @@ public class ConnectivityManager { 
            int timeoutMs, NetworkRequest.Type reqType, int legacyType, CallbackHandler handler) {

            int timeoutMs, NetworkRequest.Type reqType, int legacyType, CallbackHandler handler) {

        printStackTrace();

        printStackTrace();

        checkCallbackNotNull(callback);

        checkCallbackNotNull(callback);

        Preconditions.checkArgument(

        if (reqType != TRACK_DEFAULT && reqType != TRACK_SYSTEM_DEFAULT && need == null) {

                reqType == TRACK_DEFAULT || reqType == TRACK_SYSTEM_DEFAULT || need != null,

            throw new IllegalArgumentException("null NetworkCapabilities");

                "null NetworkCapabilities");

        }

        final NetworkRequest request;

        final NetworkRequest request;

        final String callingPackageName = mContext.getOpPackageName();

        final String callingPackageName = mContext.getOpPackageName();

        try {

        try {
@@ -4049,15 +4054,17 @@ public class ConnectivityManager { 
    }

    }





    private static void checkPendingIntentNotNull(PendingIntent intent) {

    private static void checkPendingIntentNotNull(PendingIntent intent) {

        Preconditions.checkNotNull(intent, "PendingIntent cannot be null.");

        Objects.requireNonNull(intent, "PendingIntent cannot be null.");

    }

    }





    private static void checkCallbackNotNull(NetworkCallback callback) {

    private static void checkCallbackNotNull(NetworkCallback callback) {

        Preconditions.checkNotNull(callback, "null NetworkCallback");

        Objects.requireNonNull(callback, "null NetworkCallback");

    }

    }





    private static void checkTimeout(int timeoutMs) {

    private static void checkTimeout(int timeoutMs) {

        Preconditions.checkArgumentPositive(timeoutMs, "timeoutMs must be strictly positive.");

        if (timeoutMs <= 0) {

            throw new IllegalArgumentException("timeoutMs must be strictly positive.");

        }

    }

    }





    /**

    /**
@@ -4337,8 +4344,9 @@ public class ConnectivityManager { 
        // Find all requests associated to this callback and stop callback triggers immediately.

        // Find all requests associated to this callback and stop callback triggers immediately.

        // Callback is reusable immediately. http://b/20701525, http://b/35921499.

        // Callback is reusable immediately. http://b/20701525, http://b/35921499.

        synchronized (sCallbacks) {

        synchronized (sCallbacks) {

            Preconditions.checkArgument(networkCallback.networkRequest != null,

            if (networkCallback.networkRequest == null) {

                    "NetworkCallback was not registered");

                throw new IllegalArgumentException("NetworkCallback was not registered");

            }

            if (networkCallback.networkRequest == ALREADY_UNREGISTERED) {

            if (networkCallback.networkRequest == ALREADY_UNREGISTERED) {

                Log.d(TAG, "NetworkCallback was already unregistered");

                Log.d(TAG, "NetworkCallback was already unregistered");

                return;

                return;

packages/Connectivity/framework/src/android/net/MacAddress.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -25,7 +25,6 @@ import android.os.Build; 
import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;





import com.android.internal.util.Preconditions;

import com.android.net.module.util.MacAddressUtils;

import com.android.net.module.util.MacAddressUtils;





import java.lang.annotation.Retention;

import java.lang.annotation.Retention;
@@ -34,6 +33,7 @@ import java.net.Inet6Address; 
import java.net.UnknownHostException;

import java.net.UnknownHostException;

import java.security.SecureRandom;

import java.security.SecureRandom;

import java.util.Arrays;

import java.util.Arrays;

import java.util.Objects;





/**

/**

 * Representation of a MAC address.

 * Representation of a MAC address.
@@ -229,7 +229,7 @@ public final class MacAddress implements Parcelable { 
     * @hide

     * @hide

     */

     */

    public static @NonNull byte[] byteAddrFromStringAddr(String addr) {

    public static @NonNull byte[] byteAddrFromStringAddr(String addr) {

        Preconditions.checkNotNull(addr);

        Objects.requireNonNull(addr);

        String[] parts = addr.split(":");

        String[] parts = addr.split(":");

        if (parts.length != ETHER_ADDR_LEN) {

        if (parts.length != ETHER_ADDR_LEN) {

            throw new IllegalArgumentException(addr + " was not a valid MAC address");

            throw new IllegalArgumentException(addr + " was not a valid MAC address");
@@ -275,7 +275,7 @@ public final class MacAddress implements Parcelable { 
    // Internal conversion function equivalent to longAddrFromByteAddr(byteAddrFromStringAddr(addr))

    // Internal conversion function equivalent to longAddrFromByteAddr(byteAddrFromStringAddr(addr))

    // that avoids the allocation of an intermediary byte[].

    // that avoids the allocation of an intermediary byte[].

    private static long longAddrFromStringAddr(String addr) {

    private static long longAddrFromStringAddr(String addr) {

        Preconditions.checkNotNull(addr);

        Objects.requireNonNull(addr);

        String[] parts = addr.split(":");

        String[] parts = addr.split(":");

        if (parts.length != ETHER_ADDR_LEN) {

        if (parts.length != ETHER_ADDR_LEN) {

            throw new IllegalArgumentException(addr + " was not a valid MAC address");

            throw new IllegalArgumentException(addr + " was not a valid MAC address");
@@ -364,8 +364,8 @@ public final class MacAddress implements Parcelable { 
     *

     *

     */

     */

    public boolean matches(@NonNull MacAddress baseAddress, @NonNull MacAddress mask) {

    public boolean matches(@NonNull MacAddress baseAddress, @NonNull MacAddress mask) {

        Preconditions.checkNotNull(baseAddress);

        Objects.requireNonNull(baseAddress);

        Preconditions.checkNotNull(mask);

        Objects.requireNonNull(mask);

        return (mAddr & mask.mAddr) == (baseAddress.mAddr & mask.mAddr);

        return (mAddr & mask.mAddr) == (baseAddress.mAddr & mask.mAddr);

    }

    }

packages/Connectivity/framework/src/android/net/NetworkCapabilities.java

+6 −5
Original line number Original line Diff line number Diff line
@@ -35,7 +35,6 @@ import android.util.ArraySet; 
import android.util.proto.ProtoOutputStream;

import android.util.proto.ProtoOutputStream;





import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.Preconditions;

import com.android.net.module.util.CollectionUtils;

import com.android.net.module.util.CollectionUtils;

import com.android.net.module.util.NetworkCapabilitiesUtils;

import com.android.net.module.util.NetworkCapabilitiesUtils;
@@ -2099,8 +2098,9 @@ public final class NetworkCapabilities implements Parcelable { 
    }

    }





    private static void checkValidTransportType(@Transport int transport) {

    private static void checkValidTransportType(@Transport int transport) {

        Preconditions.checkArgument(

        if (!isValidTransport(transport)) {

                isValidTransport(transport), "Invalid TransportType " + transport);

            throw new IllegalArgumentException("Invalid TransportType " + transport);

        }

    }

    }





    private static boolean isValidCapability(@NetworkCapabilities.NetCapability int capability) {

    private static boolean isValidCapability(@NetworkCapabilities.NetCapability int capability) {
@@ -2108,8 +2108,9 @@ public final class NetworkCapabilities implements Parcelable { 
    }

    }





    private static void checkValidCapability(@NetworkCapabilities.NetCapability int capability) {

    private static void checkValidCapability(@NetworkCapabilities.NetCapability int capability) {

        Preconditions.checkArgument(isValidCapability(capability),

        if (!isValidCapability(capability)) {

                "NetworkCapability " + capability + "out of range");

            throw new IllegalArgumentException("NetworkCapability " + capability + "out of range");

        }

    }

    }





    /**

    /**

packages/Connectivity/framework/src/android/net/StaticIpConfiguration.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ import android.os.Build; 
import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;





import com.android.internal.util.Preconditions;

import com.android.net.module.util.InetAddressUtils;

import com.android.net.module.util.InetAddressUtils;





import java.net.InetAddress;

import java.net.InetAddress;
@@ -153,7 +152,7 @@ public final class StaticIpConfiguration implements Parcelable { 
         * @return The {@link Builder} for chaining.

         * @return The {@link Builder} for chaining.

         */

         */

        public @NonNull Builder setDnsServers(@NonNull Iterable<InetAddress> dnsServers) {

        public @NonNull Builder setDnsServers(@NonNull Iterable<InetAddress> dnsServers) {

            Preconditions.checkNotNull(dnsServers);

            Objects.requireNonNull(dnsServers);

            mDnsServers = dnsServers;

            mDnsServers = dnsServers;

            return this;

            return this;

        }

        }