summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYe Wen <ywen@google.com>2015-09-17 21:02:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-17 21:02:29 +0000
commit03ac8778f385889e5dfc6c17fc5347d2af33b1ab (patch)
tree5e0f7a314751ddbbf0ec5158db570f5bdb42cfa7
parent66c0dcc93bf1e6d04b64a1dddf89ee2e3e9de7cc (diff)
parentc2348f85a918ec6846c3ce4957ae2cd5d69a1f33 (diff)
downloadMms-03ac8778f385889e5dfc6c17fc5347d2af33b1ab.tar.gz
am c2348f85: MMS proxy host dns lookup should happen on mms network
* commit 'c2348f85a918ec6846c3ce4957ae2cd5d69a1f33': MMS proxy host dns lookup should happen on mms network
-rw-r--r--src/com/android/mms/service/MmsHttpClient.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/mms/service/MmsHttpClient.java b/src/com/android/mms/service/MmsHttpClient.java
index e09695c..f6d3d1b 100644
--- a/src/com/android/mms/service/MmsHttpClient.java
+++ b/src/com/android/mms/service/MmsHttpClient.java
@@ -109,7 +109,8 @@ public class MmsHttpClient {
try {
Proxy proxy = Proxy.NO_PROXY;
if (isProxySet) {
- proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyPort));
+ proxy = new Proxy(Proxy.Type.HTTP,
+ new InetSocketAddress(mNetwork.getByName(proxyHost), proxyPort));
}
final URL url = new URL(urlString);
// Now get the connection