commit 0efe4aa812e0f99cf512ca8772b7f2b84f2a9d66
author Robert Greenwalt <rgreenwalt@google.com> Thu Mar 03 08:32:53 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 03 08:32:53 2011 -0800
tree af6d867619e92bb04eaa78f11545d5ffa1a5b7ed
parent 95c300a353dd6916e65d84bac7c23a13b8e0ec08
parent 0ce55042b4445316337d31c770fc4c5562493544

Merge "Add some input checking to prevent problems"

core/java/android/net/LinkProperties.java

diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java
index b6e9751..81d62a0 100644
--- a/core/java/android/net/LinkProperties.java
+++ b/core/java/android/net/LinkProperties.java
@@ -91,7 +91,7 @@
     }
 
     public void addLinkAddress(LinkAddress address) {
-        mLinkAddresses.add(address);
+        if (address != null) mLinkAddresses.add(address);
     }
 
     public Collection<LinkAddress> getLinkAddresses() {
@@ -99,7 +99,7 @@
     }
 
     public void addDns(InetAddress dns) {
-        mDnses.add(dns);
+        if (dns != null) mDnses.add(dns);
     }
 
     public Collection<InetAddress> getDnses() {
@@ -107,7 +107,7 @@
     }
 
     public void addGateway(InetAddress gateway) {
-        mGateways.add(gateway);
+        if (gateway != null) mGateways.add(gateway);
     }
     public Collection<InetAddress> getGateways() {
         return Collections.unmodifiableCollection(mGateways);