summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-04-15 02:10:46 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-04-15 02:10:46 +0000
commit123feb98447f7678f304fafb20dd4acedac83c55 (patch)
tree74d771cc9f194a6977a9a1e49f2efff101528646
parent668573d2980b2f00862877df7e7a0aaec343a380 (diff)
parent8b51f02231ca35b21264c679582a34ef3b754e5a (diff)
downloadplatform_external_ims-123feb98447f7678f304fafb20dd4acedac83c55.tar.gz
platform_external_ims-123feb98447f7678f304fafb20dd4acedac83c55.tar.bz2
platform_external_ims-123feb98447f7678f304fafb20dd4acedac83c55.zip
Snap for 6396429 from 8b51f02231ca35b21264c679582a34ef3b754e5a to rvc-release
Change-Id: I1de4455ebc861dc356d073f0ded464e37ad4df93
-rw-r--r--rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java9
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);