commit 74bec54f509e914ffd7056cdaf5f6c3e46c98fb2
author Tom Taylor <tomtaylor@google.com> Fri Jun 18 13:02:37 2021 -0700
committer Tom Taylor <tomtaylor@google.com> Mon Sep 27 18:30:06 2021 +0000
tree 9ee933f676eaabdd33611b3f75dbfab627b069d4
parent 990bd637f1b146dd58aab6204cff1712cfc2a79b

Return new and more detailed connection failure result codes

Test: manually tested sending/receiving MMSs
Bug: 185275986
Change-Id: I1d988331d1f09c71a0b3aec5e291f380b939a53c

src/com/android/mms/service/MmsService.java

diff --git a/src/com/android/mms/service/MmsService.java b/src/com/android/mms/service/MmsService.java
index 0394379..c752120 100644
--- a/src/com/android/mms/service/MmsService.java
+++ b/src/com/android/mms/service/MmsService.java
@@ -214,7 +214,7 @@
             // Make sure the subId is correct
             if (!SubscriptionManager.isValidSubscriptionId(subId)) {
                 LogUtil.e("Invalid subId " + subId);
-                sendErrorInPendingIntent(sentIntent, SmsManager.MMS_ERROR_NO_DATA_NETWORK);
+                sendErrorInPendingIntent(sentIntent, SmsManager.MMS_ERROR_INVALID_SUBSCRIPTION_ID);
                 return;
             }
             if (subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) {
@@ -223,7 +223,7 @@
 
             // Make sure the subId is active
             if (!isActiveSubId(subId)) {
-                sendErrorInPendingIntent(sentIntent, SmsManager.MMS_ERROR_NO_DATA_NETWORK);
+                sendErrorInPendingIntent(sentIntent, SmsManager.MMS_ERROR_INACTIVE_SUBSCRIPTION);
                 return;
             }
 
@@ -291,7 +291,8 @@
             // Make sure the subId is correct
             if (!SubscriptionManager.isValidSubscriptionId(subId)) {
                 LogUtil.e("Invalid subId " + subId);
-                sendErrorInPendingIntent(downloadedIntent, SmsManager.MMS_ERROR_NO_DATA_NETWORK);
+                sendErrorInPendingIntent(downloadedIntent,
+                        SmsManager.MMS_ERROR_INVALID_SUBSCRIPTION_ID);
                 return;
             }
             if (subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) {
@@ -301,8 +302,8 @@
             if (!isActiveSubId(subId)) {
                 List<SubscriptionInfo> activeSubList = getActiveSubscriptionsInGroup(subId);
                 if (activeSubList.isEmpty()) {
-                    sendErrorInPendingIntent(
-                            downloadedIntent, SmsManager.MMS_ERROR_NO_DATA_NETWORK);
+                    sendErrorInPendingIntent(downloadedIntent,
+                            SmsManager.MMS_ERROR_INACTIVE_SUBSCRIPTION);
                     return;
                 }
 
@@ -356,7 +357,7 @@
             // Make sure subId has MMS data
             if (!getTelephonyManager(subId).isDataEnabledForApn(ApnSetting.TYPE_MMS)) {
                 sendSettingsIntentForFailedMms(/*isIncoming=*/ true, subId);
-                sendErrorInPendingIntent(downloadedIntent, SmsManager.MMS_ERROR_NO_DATA_NETWORK);
+                sendErrorInPendingIntent(downloadedIntent, SmsManager.MMS_ERROR_DATA_DISABLED);
                 return;
             }