diff options
author | Brad Ebinger <breadley@google.com> | 2020-04-14 20:58:22 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-14 20:58:22 +0000 |
commit | cc90bf669e33003fabb447d5833e1991b0b15e4f (patch) | |
tree | 74d771cc9f194a6977a9a1e49f2efff101528646 | |
parent | fb8d3a72c904248418b6289839b1f121ab8225ed (diff) | |
parent | 8b51f02231ca35b21264c679582a34ef3b754e5a (diff) | |
download | ims-cc90bf669e33003fabb447d5833e1991b0b15e4f.tar.gz |
Add additional sub ID checks for race cases am: 8b51f02231
Change-Id: I00030c439bf974c413d991501b5bb40f57c58244
-rw-r--r-- | rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java | 9 |
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); |