commit bf78f3fcc04117f3272a8d5c6d132142f393edcc
author Roshan Pius <rpius@google.com> Mon Nov 18 15:05:31 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 18 15:05:31 2019 +0000
tree 0753ace51d22adadbd322e651cb6ea4c9bf93d8c
parent 4022aa38290d7c5fc7bc3c08c5e15e214251aaf0
parent d4ec40924209cc13f4fe02d32bd6dfaa966f3376

Merge "StaticIpConfiguration: Couple of minor fixes"

core/java/android/net/StaticIpConfiguration.java

diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java
index 5bc9953..990c114 100644
--- a/core/java/android/net/StaticIpConfiguration.java
+++ b/core/java/android/net/StaticIpConfiguration.java
@@ -25,6 +25,8 @@
 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 @@
          * @return The {@link Builder} for chaining.
          */
         public @NonNull Builder setDnsServers(@NonNull Iterable<InetAddress> dnsServers) {
+            Preconditions.checkNotNull(dnsServers);
             mDnsServers = dnsServers;
             return this;
         }
@@ -175,8 +178,10 @@
             final StaticIpConfiguration config = new StaticIpConfiguration();
             config.ipAddress = mIpAddress;
             config.gateway = mGateway;
-            for (InetAddress server : mDnsServers) {
-                config.dnsServers.add(server);
+            if (mDnsServers != null) {
+                for (InetAddress server : mDnsServers) {
+                    config.dnsServers.add(server);
+                }
             }
             config.domains = mDomains;
             return config;