summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYe Wen <ywen@google.com>2015-02-28 00:12:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-02-28 00:12:37 +0000
commit1f3fb2436871ba1dcc035d2c6cb67b7625543add (patch)
tree8b22dbad408ae88bc1caae870641972588602b6c
parente03feaba8ca6d25163ff19e433a3a3c460e834e8 (diff)
parent960d2d429a4a58cc1cc01653e3685afb4b45fda9 (diff)
downloadMms-1f3fb2436871ba1dcc035d2c6cb67b7625543add.tar.gz
Merge "Fix null proxy problem for MmsHttpClient"
-rw-r--r--src/com/android/mms/service/MmsHttpClient.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/mms/service/MmsHttpClient.java b/src/com/android/mms/service/MmsHttpClient.java
index da2b3e1..10b8aa2 100644
--- a/src/com/android/mms/service/MmsHttpClient.java
+++ b/src/com/android/mms/service/MmsHttpClient.java
@@ -99,7 +99,7 @@ public class MmsHttpClient {
checkMethod(method);
HttpURLConnection connection = null;
try {
- Proxy proxy = null;
+ Proxy proxy = Proxy.NO_PROXY;
if (isProxySet) {
proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyPort));
}