Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE

This commit is contained in:
Wink Saville
2011-03-14 13:41:26 -07:00
committed by Android (Google) Code Review

View File

@@ -91,7 +91,7 @@ public class LinkProperties implements Parcelable {
} }
public void addLinkAddress(LinkAddress address) { public void addLinkAddress(LinkAddress address) {
mLinkAddresses.add(address); if (address != null) mLinkAddresses.add(address);
} }
public Collection<LinkAddress> getLinkAddresses() { public Collection<LinkAddress> getLinkAddresses() {
@@ -99,7 +99,7 @@ public class LinkProperties implements Parcelable {
} }
public void addDns(InetAddress dns) { public void addDns(InetAddress dns) {
mDnses.add(dns); if (dns != null) mDnses.add(dns);
} }
public Collection<InetAddress> getDnses() { public Collection<InetAddress> getDnses() {
@@ -107,7 +107,7 @@ public class LinkProperties implements Parcelable {
} }
public void addGateway(InetAddress gateway) { public void addGateway(InetAddress gateway) {
mGateways.add(gateway); if (gateway != null) mGateways.add(gateway);
} }
public Collection<InetAddress> getGateways() { public Collection<InetAddress> getGateways() {
return Collections.unmodifiableCollection(mGateways); return Collections.unmodifiableCollection(mGateways);