commit 1a230885b356256e91b3bf006ec72213ba6f8f76
author Robert Greenwalt <rgreenwalt@google.com> Fri Jul 29 10:51:32 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 29 10:51:32 2011 -0700
tree 1b2ab225f6f6554eb9cf586b09d6b2c84b106633
parent 0d8acea9bb452d1fdbb3d811041f7bdb1b0ef8a3
parent fde1eb7cf88e488d619d3168f83fb2e740d39296

Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE

core/java/android/net/LinkProperties.java

diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java
index 132f3ba..75646fd 100644
--- a/core/java/android/net/LinkProperties.java
+++ b/core/java/android/net/LinkProperties.java
@@ -80,9 +80,9 @@
     public LinkProperties(LinkProperties source) {
         if (source != null) {
             mIfaceName = source.getInterfaceName();
-            mLinkAddresses = source.getLinkAddresses();
-            mDnses = source.getDnses();
-            mRoutes = source.getRoutes();
+            for (LinkAddress l : source.getLinkAddresses()) mLinkAddresses.add(l);
+            for (InetAddress i : source.getDnses()) mDnses.add(i);
+            for (RouteInfo r : source.getRoutes()) mRoutes.add(r);
             mHttpProxy = (source.getHttpProxy() == null)  ?
                 null : new ProxyProperties(source.getHttpProxy());
         }