commit 44a242a81dadd2397a362c9d85195d7b4a770597
author Sreeram Ramachandran <sreeram@google.com> Wed May 14 14:45:00 2014 -0700
committer Sreeram Ramachandran <sreeram@google.com> Wed May 14 14:45:00 2014 -0700
tree bf3cac34e5760190719f103d719328b78bd032a3
parent 00a2f34c9a56abb1743e298753c881e8cee8efed

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

diff --git a/core/java/android/net/ProxyInfo.java b/core/java/android/net/ProxyInfo.java
index 991d9da..ceedd98 100644
--- a/core/java/android/net/ProxyInfo.java
+++ b/core/java/android/net/ProxyInfo.java
@@ -160,6 +160,8 @@
             }
             mExclusionList = source.getExclusionListAsString();
             mParsedExclusionList = source.mParsedExclusionList;
+        } else {
+            mPacFileUrl = Uri.EMPTY;
         }
     }