diff options
| author | Ye Wen <ywen@google.com> | 2015-09-11 17:00:59 -0700 |
|---|---|---|
| committer | Ye Wen <ywen@google.com> | 2015-09-17 18:39:11 +0000 |
| commit | f3bdfd79f02937109245a846db4e6a5e8cb9971a (patch) | |
| tree | 8b7a711e67968663927b6baea8ca526f7de70b9b | |
| parent | d58a6e39a5c3aa51a7b8333605769691e5859682 (diff) | |
| download | android_packages_services_Mms-f3bdfd79f02937109245a846db4e6a5e8cb9971a.tar.gz android_packages_services_Mms-f3bdfd79f02937109245a846db4e6a5e8cb9971a.tar.bz2 android_packages_services_Mms-f3bdfd79f02937109245a846db4e6a5e8cb9971a.zip | |
Default MMS proxy port to 80 and don't skip if port is invalid
b/24002396
Change-Id: I5de0774c3d1a15f9fb04e04213f8258fb26d1f3f
(cherry picked from commit 66c0dcc93bf1e6d04b64a1dddf89ee2e3e9de7cc)
| -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"); } } } |