Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" (9cb39acf) · Commits · e / os / android_frameworks_base

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

+2 −3

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

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.Preconditions;

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

		/** @hide */
		public ConnectivityDiagnosticsManager(Context context, IConnectivityManager service) {
		mContext = Preconditions.checkNotNull(context, "missing context");
		mService = Preconditions.checkNotNull(service, "missing IConnectivityManager");
		mContext = Objects.requireNonNull(context, "missing context");
		mService = Objects.requireNonNull(service, "missing IConnectivityManager");
		}

		/** @hide */

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

+28 −20

Original line number	Diff line number	Diff line
		@@ -74,7 +74,6 @@ import android.util.Range;
		import android.util.SparseIntArray;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.util.Preconditions;

		import libcore.net.event.NetworkEventDispatcher;

		@@ -1774,7 +1773,9 @@ public class ConnectivityManager {
		// Map from type to transports.
		final int NOT_FOUND = -1;
		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);

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

		private PacketKeepalive(Network network, PacketKeepaliveCallback callback) {
		Preconditions.checkNotNull(network, "network cannot be null");
		Preconditions.checkNotNull(callback, "callback cannot be null");
		Objects.requireNonNull(network, "network cannot be null");
		Objects.requireNonNull(callback, "callback cannot be null");
		mNetwork = network;
		mExecutor = Executors.newSingleThreadExecutor();
		mCallback = new ISocketKeepaliveCallback.Stub() {
		@@ -2255,7 +2256,9 @@ public class ConnectivityManager {
		*/
		public void removeDefaultNetworkActiveListener(@NonNull OnNetworkActiveListener 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 {
		mService.registerNetworkActivityListener(rl);
		} catch (RemoteException e) {
		@@ -2283,8 +2286,8 @@ public class ConnectivityManager {
		* {@hide}
		*/
		public ConnectivityManager(Context context, IConnectivityManager service) {
		mContext = Preconditions.checkNotNull(context, "missing context");
		mService = Preconditions.checkNotNull(service, "missing IConnectivityManager");
		mContext = Objects.requireNonNull(context, "missing context");
		mService = Objects.requireNonNull(service, "missing IConnectivityManager");
		mTetheringManager = (TetheringManager) mContext.getSystemService(Context.TETHERING_SERVICE);
		sInstance = this;
		}
		@@ -2551,7 +2554,7 @@ public class ConnectivityManager {
		@RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED)
		public void startTethering(int type, boolean showProvisioningUi,
		final OnStartTetheringCallback callback, Handler handler) {
		Preconditions.checkNotNull(callback, "OnStartTetheringCallback cannot be null.");
		Objects.requireNonNull(callback, "OnStartTetheringCallback cannot be null.");

		final Executor executor = new Executor() {
		@Override
		@@ -2644,7 +2647,7 @@ public class ConnectivityManager {
		public void registerTetheringEventCallback(
		@NonNull @CallbackExecutor Executor executor,
		@NonNull final OnTetheringEventCallback callback) {
		Preconditions.checkNotNull(callback, "OnTetheringEventCallback cannot be null.");
		Objects.requireNonNull(callback, "OnTetheringEventCallback cannot be null.");

		final TetheringEventCallback tetherCallback =
		new TetheringEventCallback() {
		@@ -2942,7 +2945,7 @@ public class ConnectivityManager {
		public void getLatestTetheringEntitlementResult(int type, boolean showEntitlementUi,
		@NonNull @CallbackExecutor Executor executor,
		@NonNull final OnTetheringEntitlementResultListener listener) {
		Preconditions.checkNotNull(listener, "TetheringEntitlementResultListener cannot be null.");
		Objects.requireNonNull(listener, "TetheringEntitlementResultListener cannot be null.");
		ResultReceiver wrappedListener = new ResultReceiver(null) {
		@Override
		protected void onReceiveResult(int resultCode, Bundle resultData) {
		@@ -3315,7 +3318,9 @@ public class ConnectivityManager {
		}

		public NetworkCallback(@Flag int flags) {
		Preconditions.checkArgument((flags & VALID_FLAGS) == flags);
		if ((flags & VALID_FLAGS) != flags) {
		throw new IllegalArgumentException("Invalid flags");
		}
		mFlags = flags;
		}

		@@ -3601,7 +3606,7 @@ public class ConnectivityManager {
		}

		CallbackHandler(Handler handler) {
		this(Preconditions.checkNotNull(handler, "Handler cannot be null.").getLooper());
		this(Objects.requireNonNull(handler, "Handler cannot be null.").getLooper());
		}

		@Override
		@@ -3699,9 +3704,9 @@ public class ConnectivityManager {
		int timeoutMs, NetworkRequest.Type reqType, int legacyType, CallbackHandler handler) {
		printStackTrace();
		checkCallbackNotNull(callback);
		Preconditions.checkArgument(
		reqType == TRACK_DEFAULT \|\| reqType == TRACK_SYSTEM_DEFAULT \|\| need != null,
		"null NetworkCapabilities");
		if (reqType != TRACK_DEFAULT && reqType != TRACK_SYSTEM_DEFAULT && need == null) {
		throw new IllegalArgumentException("null NetworkCapabilities");
		}
		final NetworkRequest request;
		final String callingPackageName = mContext.getOpPackageName();
		try {
		@@ -4048,15 +4053,17 @@ public class ConnectivityManager {
		}

		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) {
		Preconditions.checkNotNull(callback, "null NetworkCallback");
		Objects.requireNonNull(callback, "null NetworkCallback");
		}

		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.");
		}
		}

		/**
		@@ -4336,8 +4343,9 @@ public class ConnectivityManager {
		// Find all requests associated to this callback and stop callback triggers immediately.
		// Callback is reusable immediately. http://b/20701525, http://b/35921499.
		synchronized (sCallbacks) {
		Preconditions.checkArgument(networkCallback.networkRequest != null,
		"NetworkCallback was not registered");
		if (networkCallback.networkRequest == null) {
		throw new IllegalArgumentException("NetworkCallback was not registered");
		}
		if (networkCallback.networkRequest == ALREADY_UNREGISTERED) {
		Log.d(TAG, "NetworkCallback was already unregistered");
		return;

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

+5 −5

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

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

		import java.lang.annotation.Retention;
		@@ -34,6 +33,7 @@ import java.net.Inet6Address;
		import java.net.UnknownHostException;
		import java.security.SecureRandom;
		import java.util.Arrays;
		import java.util.Objects;

		/**
		* Representation of a MAC address.
		@@ -229,7 +229,7 @@ public final class MacAddress implements Parcelable {
		* @hide
		*/
		public static @NonNull byte[] byteAddrFromStringAddr(String addr) {
		Preconditions.checkNotNull(addr);
		Objects.requireNonNull(addr);
		String[] parts = addr.split(":");
		if (parts.length != ETHER_ADDR_LEN) {
		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))
		// that avoids the allocation of an intermediary byte[].
		private static long longAddrFromStringAddr(String addr) {
		Preconditions.checkNotNull(addr);
		Objects.requireNonNull(addr);
		String[] parts = addr.split(":");
		if (parts.length != ETHER_ADDR_LEN) {
		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) {
		Preconditions.checkNotNull(baseAddress);
		Preconditions.checkNotNull(mask);
		Objects.requireNonNull(baseAddress);
		Objects.requireNonNull(mask);
		return (mAddr & mask.mAddr) == (baseAddress.mAddr & mask.mAddr);
		}

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ import android.util.Range;
		import android.util.proto.ProtoOutputStream;

		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.NetworkCapabilitiesUtils;

		@@ -2174,8 +2173,9 @@ public final class NetworkCapabilities implements Parcelable {
		}

		private static void checkValidTransportType(@Transport int transport) {
		Preconditions.checkArgument(
		isValidTransport(transport), "Invalid TransportType " + transport);
		if (!isValidTransport(transport)) {
		throw new IllegalArgumentException("Invalid TransportType " + transport);
		}
		}

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

		private static void checkValidCapability(@NetworkCapabilities.NetCapability int capability) {
		Preconditions.checkArgument(isValidCapability(capability),
		"NetworkCapability " + capability + "out of range");
		if (!isValidCapability(capability)) {
		throw new IllegalArgumentException("NetworkCapability " + capability + "out of range");
		}
		}

		/**

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

+1 −2

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

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

		import java.net.InetAddress;
		@@ -153,7 +152,7 @@ public final class StaticIpConfiguration implements Parcelable {
		* @return The {@link Builder} for chaining.
		*/
		public @NonNull Builder setDnsServers(@NonNull Iterable<InetAddress> dnsServers) {
		Preconditions.checkNotNull(dnsServers);
		Objects.requireNonNull(dnsServers);
		mDnsServers = dnsServers;
		return this;
		}