From fd151ec69b0b8b1c7ffbeb278c197bf337108595 Mon Sep 17 00:00:00 2001
From: Irfan Sheriff <isheriff@google.com>
Date: Mon, 30 Aug 2010 20:37:17 -0700
Subject: [PATCH] Fix reboot loop due to NPE

Bug: 2962059
Change-Id: I73d5fa5ef0f29dc139c843b34f58f189c94dfe4b
---
 core/java/android/net/LinkProperties.java  | 12 +++++++-----
 core/java/android/net/ProxyProperties.java |  8 +++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java
index 9cb38e38b7..24aebfcd2f 100644
--- a/core/java/android/net/LinkProperties.java
+++ b/core/java/android/net/LinkProperties.java
@@ -48,11 +48,13 @@ public class LinkProperties implements Parcelable {
 
     // copy constructor instead of clone
     public LinkProperties(LinkProperties source) {
-        mIface = source.getInterface();
-        mAddresses = source.getAddresses();
-        mDnses = source.getDnses();
-        mGateway = source.getGateway();
-        mHttpProxy = new ProxyProperties(source.getHttpProxy());
+        if (source != null) {
+            mIface = source.getInterface();
+            mAddresses = source.getAddresses();
+            mDnses = source.getDnses();
+            mGateway = source.getGateway();
+            mHttpProxy = new ProxyProperties(source.getHttpProxy());
+        }
     }
 
     public void setInterface(NetworkInterface iface) {
diff --git a/core/java/android/net/ProxyProperties.java b/core/java/android/net/ProxyProperties.java
index 24f6766d6d..ba27221ed1 100644
--- a/core/java/android/net/ProxyProperties.java
+++ b/core/java/android/net/ProxyProperties.java
@@ -38,9 +38,11 @@ public class ProxyProperties implements Parcelable {
 
     // copy constructor instead of clone
     public ProxyProperties(ProxyProperties source) {
-        mProxy = source.getAddress();
-        mPort = source.getPort();
-        mExclusionList = new String(source.getExclusionList());
+        if (source != null) {
+            mProxy = source.getAddress();
+            mPort = source.getPort();
+            mExclusionList = new String(source.getExclusionList());
+        }
     }
 
     public InetAddress getAddress() {