summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robert Greenwalt <rgreenwalt@google.com> 2011-03-02 17:03:37 -0800
committer Robert Greenwalt <rgreenwalt@google.com> 2011-03-02 17:03:37 -0800
commitb8167c35bbfd63493e84c2b1d3d28a59957a3bc4 (patch)
treeba0e8ae6ba7759a8e3a4001e459e829239c685c2
parent7c4beadf57c893f17efc0550b13498a06958f90c (diff)
Add some input checking to prevent problems
Adding nulls can cause unhappiness. It's suspected as a cause of 3495045. bug:3495045 Change-Id: I1d83a5461caa0b8de9602f93a40681e7963b915e
-rw-r--r--core/java/android/net/LinkProperties.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java
index b6e9751a520b..81d62a06b9a4 100644
--- a/core/java/android/net/LinkProperties.java
+++ b/core/java/android/net/LinkProperties.java
@@ -91,7 +91,7 @@ public class LinkProperties implements Parcelable {
}
public void addLinkAddress(LinkAddress address) {
- mLinkAddresses.add(address);
+ if (address != null) mLinkAddresses.add(address);
}
public Collection<LinkAddress> getLinkAddresses() {
@@ -99,7 +99,7 @@ public class LinkProperties implements Parcelable {
}
public void addDns(InetAddress dns) {
- mDnses.add(dns);
+ if (dns != null) mDnses.add(dns);
}
public Collection<InetAddress> getDnses() {
@@ -107,7 +107,7 @@ public class LinkProperties implements Parcelable {
}
public void addGateway(InetAddress gateway) {
- mGateways.add(gateway);
+ if (gateway != null) mGateways.add(gateway);
}
public Collection<InetAddress> getGateways() {
return Collections.unmodifiableCollection(mGateways);