commit 04cac40ff86e175444991c07869cb85219db1019
author Robert Greenwalt <rgreenwalt@google.com> Wed Mar 02 17:03:37 2011 -0800
committer Wink Saville <wink@google.com> Mon Mar 14 12:25:09 2011 -0700
tree 9c706d9dca4fd2e6d6b553bb778c59b8cb6d5fdf
parent 9d7d62801ddb206d2ea96d74864a9edfe54d2eee

Do not merge: Add some input checking to prevent problems

Adding nulls can cause unhappiness.  It's suspected as a cause of 3495045.

bug:3495045
Change-Id: I925c965ef64032fc57849bf15fe9b11f4bc99351

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);