From c63e50cd55b1da8ef11857e578c96bc2d2aed74c Mon Sep 17 00:00:00 2001 From: Sreeram Ramachandran Date: Wed, 14 May 2014 14:45:00 -0700 Subject: [PATCH] Fix reboot loop due to NPE. All that's old is new again: http://ag/63748. Change-Id: I83df48447dbcb7f6edf02bd07abf721b009afa49 --- core/java/android/net/ProxyInfo.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/java/android/net/ProxyInfo.java b/core/java/android/net/ProxyInfo.java index 991d9dacd7..ceedd98e77 100644 --- a/core/java/android/net/ProxyInfo.java +++ b/core/java/android/net/ProxyInfo.java @@ -160,6 +160,8 @@ public class ProxyInfo implements Parcelable { } mExclusionList = source.getExclusionListAsString(); mParsedExclusionList = source.mParsedExclusionList; + } else { + mPacFileUrl = Uri.EMPTY; } }