From f3ab069bec358f8138fed5ceabe64e303ac7d8f9 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Thu, 28 Jul 2011 17:21:25 -0700 Subject: [PATCH] Make copy-constructor make deep copy. Used to grab immutables but now will copy the data so the result is mutable and we don't get crashes. bug:5051667 Change-Id: I0878bf8c58069055f528121541d1911f404cbe49 --- core/java/android/net/LinkProperties.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java index 132f3bad2d..75646fdf90 100644 --- a/core/java/android/net/LinkProperties.java +++ b/core/java/android/net/LinkProperties.java @@ -80,9 +80,9 @@ public class LinkProperties implements Parcelable { 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()); }