Add additional sub ID checks for race cases

In some race cases, publish requests will be triggered when
the sub ID has changed to INVALID. Check for this condition and
return IMS services as not capable.

Fixes: 153369874
Test: manual
Change-Id: I2092656c210f0ddc8421960c548c27cad1096434

1 files changed, 9 insertions, 0 deletions

diff --git a/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java b/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java
index 13e0f42..056e4d0 100644
--- a/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java
+++ b/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java
@@ -277,6 +277,9 @@ public class RcsSettingUtils {
     }
 
     public static boolean isVoLteSupported(int subId) {
+        if (!SubscriptionManager.isValidSubscriptionId(subId)) {
+            return false;
+        }
         LinkedBlockingQueue<Boolean> resultQueue = new LinkedBlockingQueue<>(1);
         try {
             ImsMmTelManager mmTelManager = ImsMmTelManager.createForSubscriptionId(subId);
@@ -296,6 +299,9 @@ public class RcsSettingUtils {
     }
 
     public static boolean isVoWiFiSupported(int subId) {
+        if (!SubscriptionManager.isValidSubscriptionId(subId)) {
+            return false;
+        }
         LinkedBlockingQueue<Boolean> resultQueue = new LinkedBlockingQueue<>(1);
         try {
             ImsMmTelManager mmTelManager = ImsMmTelManager.createForSubscriptionId(subId);
@@ -315,6 +321,9 @@ public class RcsSettingUtils {
     }
 
     public static boolean isVtSupported(int subId) {
+        if (!SubscriptionManager.isValidSubscriptionId(subId)) {
+            return false;
+        }
         LinkedBlockingQueue<Boolean> resultQueue = new LinkedBlockingQueue<>(1);
         try {
             ImsMmTelManager mmTelManager = ImsMmTelManager.createForSubscriptionId(subId);