summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCheuksan Wang <edwang@google.com>2015-05-12 18:36:03 -0700
committerThe Android Automerger <android-build@google.com>2015-05-13 12:49:10 -0700
commit71ffc0a0a76ea9e4c7f34a7b36c51c7e54e105df (patch)
treec971d0286b170093a12c206e98ad3f296e2df863
parent96069ef72d77e1a01b3404fdfe6af9a13cacabda (diff)
downloadandroid_packages_services_Mms-71ffc0a0a76ea9e4c7f34a7b36c51c7e54e105df.tar.gz
android_packages_services_Mms-71ffc0a0a76ea9e4c7f34a7b36c51c7e54e105df.tar.bz2
android_packages_services_Mms-71ffc0a0a76ea9e4c7f34a7b36c51c7e54e105df.zip
remove active sub ID check for mms download
mms download can happen long after mms notification. remove the active sub ID check until we can handle MVNO's with multiple sub ID's. BUG:20973889 Change-Id: I49184e70dd348bff7287f79eee29f09888e75e2a
-rw-r--r--src/com/android/mms/service/MmsService.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/mms/service/MmsService.java b/src/com/android/mms/service/MmsService.java
index dd01f30..b6058c9 100644
--- a/src/com/android/mms/service/MmsService.java
+++ b/src/com/android/mms/service/MmsService.java
@@ -194,11 +194,10 @@ public class MmsService extends Service implements MmsRequest.RequestManager {
// Make sure the subId is correct
subId = checkSubId(subId);
- // Make sure the subId is active
- if (!isActiveSubId(subId)) {
- sendErrorInPendingIntent(downloadedIntent);
- return;
- }
+ // If the subId is no longer active it could be caused by
+ // an MVNO using multiple subIds, so we should try to
+ // download anyway.
+ // TODO: Fail fast when downloading will fail (i.e. SIM swapped)
final DownloadRequest request = new DownloadRequest(MmsService.this, subId,
locationUrl, contentUri, downloadedIntent, callingPkg, configOverrides);