diff options
| author | Andre Furtado <afurtado@google.com> | 2016-09-15 01:58:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-15 01:58:43 +0000 |
| commit | 20d3463bae1c7e983cdcea86d05322e2c1273a47 (patch) | |
| tree | d1e53da429ea6575ecafffd8e19b58b658287d41 | |
| parent | ff128130758f79d7017c1b56455a1ea50ff788d6 (diff) | |
| parent | 91aebcecdd61b908221359a9a01a94ae5257d886 (diff) | |
| download | Mms-20d3463bae1c7e983cdcea86d05322e2c1273a47.tar.gz | |
Bump up MMS network request timeout and don't retry am: d0c5b20403 am: ef3bdb5f6e
am: 91aebcecdd
Change-Id: I47dc16ff871f660688361d47aaa58f7bc6114cd2
| -rw-r--r-- | src/com/android/mms/service/MmsNetworkManager.java | 3 | ||||
| -rw-r--r-- | src/com/android/mms/service/MmsRequest.java | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/mms/service/MmsNetworkManager.java b/src/com/android/mms/service/MmsNetworkManager.java index 67b0af6..c2e2f6a 100644 --- a/src/com/android/mms/service/MmsNetworkManager.java +++ b/src/com/android/mms/service/MmsNetworkManager.java @@ -31,7 +31,8 @@ import com.android.mms.service.exception.MmsNetworkException; */ public class MmsNetworkManager { // Timeout used to call ConnectivityManager.requestNetwork - private static final int NETWORK_REQUEST_TIMEOUT_MILLIS = 60 * 1000; + // Given that the telephony layer will retry on failures, this timeout should be high enough. + private static final int NETWORK_REQUEST_TIMEOUT_MILLIS = 30 * 60 * 1000; // Wait timeout for this class, a little bit longer than the above timeout // to make sure we don't bail prematurely private static final int NETWORK_ACQUIRE_TIMEOUT_MILLIS = diff --git a/src/com/android/mms/service/MmsRequest.java b/src/com/android/mms/service/MmsRequest.java index e4ebdc4..4eeac08 100644 --- a/src/com/android/mms/service/MmsRequest.java +++ b/src/com/android/mms/service/MmsRequest.java @@ -147,7 +147,7 @@ public abstract class MmsRequest { result = SmsManager.MMS_ERROR_IO_ERROR; } else { // Execute long retryDelaySecs = 2; - // Try multiple times of MMS HTTP request + // Try multiple times of MMS HTTP request, depending on the error. for (int i = 0; i < RETRY_TIMES; i++) { try { networkManager.acquireNetwork(requestId); @@ -182,7 +182,7 @@ public abstract class MmsRequest { } catch (MmsNetworkException e) { LogUtil.e(requestId, "MMS network acquiring failure", e); result = SmsManager.MMS_ERROR_UNABLE_CONNECT_MMS; - // Retry + break; } catch (MmsHttpException e) { LogUtil.e(requestId, "HTTP or network I/O failure", e); result = SmsManager.MMS_ERROR_HTTP_FAILURE; |