Merge "Let phone_setup_on_rat and is_phone_in_call_on_rat support 5G NSA" am: 72cd5465ec am: 2cf1d88032 am: 1927b73ec6
Original change: https://android-review.googlesource.com/c/platform/tools/test/connectivity/+/1645108
Change-Id: I231086515fd475dc7b11e7a51ca86c832e905da8
diff --git a/acts_tests/acts_contrib/test_utils/tel/tel_voice_utils.py b/acts_tests/acts_contrib/test_utils/tel/tel_voice_utils.py
index f6bdfe0..38eae32 100644
--- a/acts_tests/acts_contrib/test_utils/tel/tel_voice_utils.py
+++ b/acts_tests/acts_contrib/test_utils/tel/tel_voice_utils.py
@@ -1966,7 +1966,19 @@
else:
sub_id = get_outgoing_voice_sub_id(ad)
- if rat.lower() == 'volte':
+ if rat.lower() == '5g_volte':
+ if only_return_fn:
+ return phone_setup_volte_for_subscription
+ else:
+ return phone_setup_volte_for_subscription(log, ad, sub_id, GEN_5G)
+
+ elif rat.lower() == '5g_csfb':
+ if only_return_fn:
+ return phone_setup_csfb_for_subscription
+ else:
+ return phone_setup_csfb_for_subscription(log, ad, sub_id, GEN_5G)
+
+ elif rat.lower() == 'volte':
if only_return_fn:
return phone_setup_volte_for_subscription
else:
@@ -2003,13 +2015,13 @@
return phone_setup_voice_general_for_subscription(log, ad, sub_id)
def is_phone_in_call_on_rat(log, ad, rat='volte', only_return_fn=None):
- if rat.lower() == 'volte':
+ if rat.lower() == 'volte' or rat.lower() == '5g_volte':
if only_return_fn:
return is_phone_in_call_volte
else:
return is_phone_in_call_volte(log, ad)
- elif rat.lower() == 'csfb':
+ elif rat.lower() == 'csfb' or rat.lower() == '5g_csfb':
if only_return_fn:
return is_phone_in_call_csfb
else: