Merge "StaticIpConfiguration: Couple of minor fixes" (5c4c9872) · Commits · e / os / android_frameworks_base

core/java/android/net/StaticIpConfiguration.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -25,6 +25,8 @@ import android.net.shared.InetAddressUtils;
		import android.os.Parcel;
		import android.os.Parcelable;

		import com.android.internal.util.Preconditions;

		import java.net.InetAddress;
		import java.util.ArrayList;
		import java.util.List;
		@@ -152,6 +154,7 @@ public final class StaticIpConfiguration implements Parcelable {
		* @return The {@link Builder} for chaining.
		*/
		public @NonNull Builder setDnsServers(@NonNull Iterable<InetAddress> dnsServers) {
		Preconditions.checkNotNull(dnsServers);
		mDnsServers = dnsServers;
		return this;
		}
		@@ -175,9 +178,11 @@ public final class StaticIpConfiguration implements Parcelable {
		final StaticIpConfiguration config = new StaticIpConfiguration();
		config.ipAddress = mIpAddress;
		config.gateway = mGateway;
		if (mDnsServers != null) {
		for (InetAddress server : mDnsServers) {
		config.dnsServers.add(server);
		}
		}
		config.domains = mDomains;
		return config;
		}