diff options
| author | Dan Pasanen <invisiblek@cyanogenmod.org> | 2016-12-05 20:36:40 -0600 |
|---|---|---|
| committer | Dan Pasanen <invisiblek@cyanogenmod.org> | 2016-12-05 20:36:40 -0600 |
| commit | 29e321b14e6b2c1b98fb74356f726d24fcb1263a (patch) | |
| tree | d1e53da429ea6575ecafffd8e19b58b658287d41 | |
| parent | 0d09a5bcc6c1b045905e3625b8fad44067e44e16 (diff) | |
| parent | d0c5b20403b3924cee67e0e72d745b10b0691eac (diff) | |
| download | android_packages_services_Mms-cm-14.1_prerebase.tar.gz android_packages_services_Mms-cm-14.1_prerebase.tar.bz2 android_packages_services_Mms-cm-14.1_prerebase.zip | |
Merge tag 'android-7.1.1_r4' into cm-14.1cm-14.1_prerebase
Android 7.1.1 release 4
# gpg: Signature made Thu Dec 1 13:07:06 2016 CST
# gpg: using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
| -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; |