commit 9e8408f49af77a33bfce85d3a630bdc4fc663a36
author Taesu Lee <taesu82.lee@samsung.com> Tue Oct 29 15:03:11 2019 +0900
committer Taesu Lee <taesu82.lee@samsung.com> Tue Oct 29 15:03:11 2019 +0900
tree 010efc4dcda373762e745a7fb473f106e7cac9c8
parent 3f656948f59e0b7d9b32ff22aae763b388ef27ed

Handling invalid subId directly instead of throwing RuntimeException

If the subId is invalid, just send the PendingIntent with error for
sending/downloading MMS and return empty mmsConfig bundle for
getCarrierConfigValues().

Test: Manual

Change-Id: I8668f2f55596272da7e5a532cc2dfbc3e6ddb008
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>

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 5720f61..a72f789 100644
--- a/src/com/android/mms/service/MmsService.java
+++ b/src/com/android/mms/service/MmsService.java
@@ -155,16 +155,6 @@
         }
     }
 
-    private int checkSubId(int subId) {
-        if (!SubscriptionManager.isValidSubscriptionId(subId)) {
-            throw new RuntimeException("Invalid subId " + subId);
-        }
-        if (subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) {
-            return SubscriptionManager.getDefaultSmsSubscriptionId();
-        }
-        return subId;
-    }
-
     @Nullable
     private String getCarrierMessagingServicePackageIfExists(int subId) {
         Intent intent = new Intent(CarrierMessagingService.SERVICE_INTERFACE);
@@ -187,7 +177,14 @@
             enforceSystemUid();
 
             // Make sure the subId is correct
-            subId = checkSubId(subId);
+            if (!SubscriptionManager.isValidSubscriptionId(subId)) {
+                LogUtil.e("Invalid subId " + subId);
+                sendErrorInPendingIntent(sentIntent);
+                return;
+            }
+            if (subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) {
+                subId = SubscriptionManager.getDefaultSmsSubscriptionId();
+            }
 
             // Make sure the subId is active
             if (!isActiveSubId(subId)) {
@@ -235,7 +232,14 @@
             enforceSystemUid();
 
             // Make sure the subId is correct
-            subId = checkSubId(subId);
+            if (!SubscriptionManager.isValidSubscriptionId(subId)) {
+                LogUtil.e("Invalid subId " + subId);
+                sendErrorInPendingIntent(downloadedIntent);
+                return;
+            }
+            if (subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) {
+                subId = SubscriptionManager.getDefaultSmsSubscriptionId();
+            }
 
             final DownloadRequest request = new DownloadRequest(MmsService.this, subId, locationUrl,
                     contentUri, downloadedIntent, callingPkg, configOverrides, MmsService.this);
@@ -259,10 +263,17 @@
             addSimRequest(request);
         }
 
+        @Override
         public Bundle getCarrierConfigValues(int subId) {
             LogUtil.d("getCarrierConfigValues");
             // Make sure the subId is correct
-            subId = checkSubId(subId);
+            if (!SubscriptionManager.isValidSubscriptionId(subId)) {
+                LogUtil.e("Invalid subId " + subId);
+                return new Bundle();
+            }
+            if (subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) {
+                subId = SubscriptionManager.getDefaultSmsSubscriptionId();
+            }
             final Bundle mmsConfig = MmsConfigManager.getInstance().getMmsConfigBySubId(subId);
             if (mmsConfig == null) {
                 return new Bundle();