diff options
| author | Jason Monk <jmonk@google.com> | 2014-05-09 17:11:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-09 17:11:15 +0000 |
| commit | c241db85c937102714e4cb125c97c79f80bebbec (patch) | |
| tree | 37f43718098001e9f77c9c7651be26e7dc25a6a5 /core/java | |
| parent | 2509be2bb7f00d615e7e8770c713a36fcf8b9ee1 (diff) | |
| parent | 5df281a570555ee132a12a4aac9aec96e8618270 (diff) | |
| download | frameworks_base-c241db85c937102714e4cb125c97c79f80bebbec.zip frameworks_base-c241db85c937102714e4cb125c97c79f80bebbec.tar.gz frameworks_base-c241db85c937102714e4cb125c97c79f80bebbec.tar.bz2 | |
Merge "Fix badness from proxy refactoring."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/Proxy.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/net/Proxy.java b/core/java/android/net/Proxy.java index 8f41e85..daf0065 100644 --- a/core/java/android/net/Proxy.java +++ b/core/java/android/net/Proxy.java @@ -278,7 +278,9 @@ public final class Proxy { host = p.getHost(); port = Integer.toString(p.getPort()); exclList = p.getExclusionListAsString(); - pacFileUrl = p.getPacFileUrl().toString(); + if (p.getPacFileUrl() != null) { + pacFileUrl = p.getPacFileUrl().toString(); + } } setHttpProxySystemProperty(host, port, exclList, pacFileUrl); } |