diff options
| author | Ye Wen <ywen@google.com> | 2015-09-17 20:29:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-17 20:29:42 +0000 |
| commit | c26d8195e22a474ecef0e15b9707fa398722a167 (patch) | |
| tree | 5e0f7a314751ddbbf0ec5158db570f5bdb42cfa7 | |
| parent | c2348f85a918ec6846c3ce4957ae2cd5d69a1f33 (diff) | |
| parent | f3bdfd79f02937109245a846db4e6a5e8cb9971a (diff) | |
| download | android_packages_services_Mms-c26d8195e22a474ecef0e15b9707fa398722a167.tar.gz android_packages_services_Mms-c26d8195e22a474ecef0e15b9707fa398722a167.tar.bz2 android_packages_services_Mms-c26d8195e22a474ecef0e15b9707fa398722a167.zip | |
Merge "Default MMS proxy port to 80 and don't skip if port is invalid" into mnc-dr-dev
| -rw-r--r-- | src/com/android/mms/service/ApnSettings.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/mms/service/ApnSettings.java b/src/com/android/mms/service/ApnSettings.java index 9a2b7ca..48383c1 100644 --- a/src/com/android/mms/service/ApnSettings.java +++ b/src/com/android/mms/service/ApnSettings.java @@ -113,7 +113,8 @@ public class ApnSettings { if (cursor != null) { String mmscUrl = null; String proxyAddress = null; - int proxyPort = -1; + // Default proxy port to 80 + int proxyPort = 80; while (cursor.moveToNext()) { // Read values from APN settings if (isValidApnType( @@ -133,12 +134,11 @@ public class ApnSettings { proxyAddress = NetworkUtils.trimV4AddrZeros(proxyAddress); final String portString = trimWithNullCheck(cursor.getString(COLUMN_MMSPORT)); - if (portString != null) { + if (!TextUtils.isEmpty(portString)) { try { proxyPort = Integer.parseInt(portString); } catch (NumberFormatException e) { - LogUtil.e(requestId, "Invalid port " + portString); - throw new ApnException("Invalid port " + portString); + LogUtil.e(requestId, "Invalid port " + portString + ", use 80"); } } } |