diff options
| author | Paul Jensen <pauljensen@google.com> | 2014-12-10 15:12:18 -0500 |
|---|---|---|
| committer | Paul Jensen <pauljensen@google.com> | 2014-12-10 15:22:12 -0500 |
| commit | e0bef71662d81caaaa0d7214fb0bef5d39996a69 (patch) | |
| tree | c7d7632e475868d3a63f059f44395fd636ca2cf5 /core/java/android/net/ProxyInfo.java | |
| parent | 8b33cf4d34a9ea75e1121ee2f1d829b21f3cb5d6 (diff) | |
| download | frameworks_base-e0bef71662d81caaaa0d7214fb0bef5d39996a69.zip frameworks_base-e0bef71662d81caaaa0d7214fb0bef5d39996a69.tar.gz frameworks_base-e0bef71662d81caaaa0d7214fb0bef5d39996a69.tar.bz2 | |
Fix several HTTP proxy issues with multinetworking.
1. Send PROXY_CHANGE_ACTION broadcast when any network's proxy changes,
not just the default network.
2. When a process is bound to a particular Network, update the proxy
system properties to those for the bound Network, and keep them
updated when PROXY_CHANGE_ACTION broadcasts are received.
3. Make Network.openConnection() use the proxy for the Network.
bug:17905627
bug:17420465
bug:18144582
(cherry-pick of https://android-review.googlesource.com/#/c/115170)
Change-Id: Ia2819985e6108a8c121e74c683a5646becfd0a97
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("] "); |