diff options
| author | Paul Jensen <pauljensen@google.com> | 2014-12-11 10:25:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-11 10:25:47 +0000 |
| commit | 87dfb9ec25c79ffe34e98ce03ae2eb183b774615 (patch) | |
| tree | f3ad3610fa8a85f3b364af3ef60f534a2f501f20 /core/java/android/net/ProxyInfo.java | |
| parent | 072c7638afe9de3fe073cd0e824d41405e6401ff (diff) | |
| parent | 8f58207319fc2b73f83874892a544f8cf59cf7e9 (diff) | |
| download | frameworks_base-87dfb9ec25c79ffe34e98ce03ae2eb183b774615.zip frameworks_base-87dfb9ec25c79ffe34e98ce03ae2eb183b774615.tar.gz frameworks_base-87dfb9ec25c79ffe34e98ce03ae2eb183b774615.tar.bz2 | |
am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev automerge: d9d48cc
automerge: 8f58207
* commit '8f58207319fc2b73f83874892a544f8cf59cf7e9':
Fix several HTTP proxy issues with multinetworking.
Diffstat (limited to 'core/java/android/net/ProxyInfo.java')
| -rw-r--r-- | core/java/android/net/ProxyInfo.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/net/ProxyInfo.java b/core/java/android/net/ProxyInfo.java index 7694420..a3cad77 100644 --- a/core/java/android/net/ProxyInfo.java +++ b/core/java/android/net/ProxyInfo.java @@ -260,7 +260,8 @@ public class ProxyInfo implements Parcelable { if (!Uri.EMPTY.equals(mPacFileUrl)) { sb.append("PAC Script: "); sb.append(mPacFileUrl); - } else if (mHost != null) { + } + if (mHost != null) { sb.append("["); sb.append(mHost); sb.append("] "); |