Moved functions to tel_voice_utils and tel_phone_setup_utils
1. Voice call related functions are moved to tel_voice_utils:
- check_call_status
- update_voice_call_type_dict
- dial_phone_number
- disconnect_call_by_id
- dumpsys_last_call_info
- dumpsys_last_call_number
- dumpsys_new_call_info
- emergency_dialer_call_by_keyevent
- hangup_call_by_adb
- hangup_call
- initiate_emergency_dialer_call_by_adb
- initiate_call
- last_call_drop_reason
- call_reject
- call_reject_for_subscription
- call_reject_leave_message
- check_reject_needed_for_voice_mail
- call_reject_leave_message_for_subscription
- call_voicemail_erase_all_pending_voicemail
- call_setup_teardown
- call_setup_teardown_for_subscription
- is_phone_in_call
- is_phone_in_call_active
- _wait_for_ringing_event
- wait_for_telecom_ringing
- wait_for_ringing_call
- wait_for_ringing_call_for_subscription
- wait_for_call_offhook_for_subscription
- wait_for_call_offhook_event
- wait_and_answer_call_for_subscription
- wait_and_reject_call
- wait_and_reject_call_for_subscription
- wait_and_answer_call
- wait_for_in_call_active(
- wait_for_droid_in_call
- wait_for_call_id_clearing
- wait_for_call_end
- check_call
- check_call_in_wfc
- check_call_in_volte
- change_ims_setting
- verify_default_ims_settin
2. Phone setup related related functions are move to tel_phone_setup_utils:
- phone_setup_iwlan
- phone_setup_iwlan_for_subscription
- phone_setup_iwlan_cellular_preferred
- phone_setup_data_for_subscription
- phone_setup_5g
- phone_setup_5g_for_subscription
- phone_setup_4g
- phone_setup_4g_for_subscription
- phone_setup_3g
- phone_setup_3g_for_subscription
- phone_setup_2g
- phone_setup_2g_for_subscription
- phone_setup_csfb
- phone_setup_csfb_for_subscription
- phone_setup_volte
- phone_setup_volte_for_subscription
- phone_setup_voice_3g
- phone_setup_voice_3g_for_subscription
- phone_setup_voice_2g
- phone_setup_voice_2g_for_subscription
- phone_setup_voice_general
- phone_setup_voice_general_for_slot
- phone_setup_voice_general_for_subscription
- phone_setup_data_general
- phone_setup_data_general_for_subscription
- phone_setup_rat_for_subscription
- phone_setup_lte_gsm_wcdma
- phone_setup_lte_gsm_wcdma_for_subscription
- phone_setup_gsm_umts
- phone_setup_gsm_umts_for_subscription
- phone_setup_gsm_only
- phone_setup_gsm_only_for_subscription
- phone_setup_lte_cdma_evdo
- phone_setup_lte_cdma_evdo_for_subscription
- phone_setup_cdma
- phone_setup_cdma_for_subscription
- phone_idle_volte
- phone_idle_volte_for_subscription
- phone_idle_iwlan
- phone_idle_iwlan_for_subscription
- phone_idle_not_iwlan
- phone_idle_not_iwlan_for_subscription
- phone_idle_csfb
- phone_idle_csfb_for_subscription
- phone_idle_3g
- phone_idle_3g_for_subscription
- phone_idle_2g
- phone_idle_2g_for_subscription
- phone_setup_on_rat
- wait_for_network_idle
- ensure_preferred_network_type_for_subscription
- ensure_network_rat
- ensure_network_rat_for_subscription
- ensure_network_preference
- ensure_network_preference_for_subscription
- ensure_network_generation
- ensure_network_generation_for_subscription
- wait_for_network_rat
- wait_for_network_rat_for_subscription
- wait_for_not_network_rat
- wait_for_not_network_rat_for_subscription
- wait_for_preferred_network
- wait_for_preferred_network_for_subscription
- wait_for_network_generation
- wait_for_network_generation_for_subscription
- ensure_phones_idle
- ensure_phone_idle
- ensure_phone_subscription
- ensure_phone_default_state
- ensure_phones_default_state
- is_phone_not_in_call
- wait_for_droid_not_in_call
Bug: None
Test: Yes, locally
Change-Id: Ibb436b5985eea0221deff3bcb79fd1201039787f
diff --git a/acts_tests/acts_contrib/test_utils/tel/tel_dsds_utils.py b/acts_tests/acts_contrib/test_utils/tel/tel_dsds_utils.py
index 08d119f..8e71b74 100644
--- a/acts_tests/acts_contrib/test_utils/tel/tel_dsds_utils.py
+++ b/acts_tests/acts_contrib/test_utils/tel/tel_dsds_utils.py
@@ -35,6 +35,11 @@
from acts_contrib.test_utils.tel.tel_ss_utils import set_call_waiting
from acts_contrib.test_utils.tel.tel_ims_utils import toggle_wfc_for_subscription
from acts_contrib.test_utils.tel.tel_ims_utils import set_wfc_mode_for_subscription
+from acts_contrib.test_utils.tel.tel_phone_setup_utils import phone_setup_voice_general
+from acts_contrib.test_utils.tel.tel_phone_setup_utils import phone_setup_on_rat
+from acts_contrib.test_utils.tel.tel_phone_setup_utils import wait_for_network_idle
+from acts_contrib.test_utils.tel.tel_ss_utils import three_phone_call_forwarding_short_seq
+from acts_contrib.test_utils.tel.tel_ss_utils import three_phone_call_waiting_short_seq
from acts_contrib.test_utils.tel.tel_subscription_utils import get_default_data_sub_id
from acts_contrib.test_utils.tel.tel_subscription_utils import get_incoming_voice_sub_id
from acts_contrib.test_utils.tel.tel_subscription_utils import get_outgoing_message_sub_id
@@ -47,11 +52,8 @@
from acts_contrib.test_utils.tel.tel_subscription_utils import set_subid_for_data
from acts_contrib.test_utils.tel.tel_subscription_utils import set_voice_sub_id
from acts_contrib.test_utils.tel.tel_test_utils import active_file_download_test
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
from acts_contrib.test_utils.tel.tel_test_utils import get_operator_name
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call
from acts_contrib.test_utils.tel.tel_test_utils import num_active_calls
from acts_contrib.test_utils.tel.tel_test_utils import power_off_sim
from acts_contrib.test_utils.tel.tel_test_utils import power_on_sim
@@ -59,22 +61,21 @@
from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
from acts_contrib.test_utils.tel.tel_test_utils import verify_incall_state
from acts_contrib.test_utils.tel.tel_test_utils import verify_http_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_and_reject_call_for_subscription
from acts_contrib.test_utils.tel.tel_test_utils import wifi_toggle_state
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_on_rat
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_general
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_on_rat
-from acts_contrib.test_utils.tel.tel_voice_utils import swap_calls
-from acts_contrib.test_utils.tel.tel_voice_utils import three_phone_call_forwarding_short_seq
-from acts_contrib.test_utils.tel.tel_voice_utils import three_phone_call_waiting_short_seq
-from acts_contrib.test_utils.tel.tel_voice_utils import two_phone_call_msim_for_slot
-from acts_contrib.test_utils.tel.tel_voice_utils import wait_for_network_idle
from acts_contrib.test_utils.tel.tel_voice_conf_utils import _test_ims_conference_merge_drop_second_call_from_participant
from acts_contrib.test_utils.tel.tel_voice_conf_utils import _test_wcdma_conference_merge_drop
from acts_contrib.test_utils.tel.tel_voice_conf_utils import _three_phone_call_mo_add_mt
+from acts_contrib.test_utils.tel.tel_voice_utils import call_setup_teardown
+from acts_contrib.test_utils.tel.tel_voice_utils import hangup_call
+from acts_contrib.test_utils.tel.tel_voice_utils import initiate_call
+from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_on_rat
+from acts_contrib.test_utils.tel.tel_voice_utils import swap_calls
+from acts_contrib.test_utils.tel.tel_voice_utils import two_phone_call_msim_for_slot
+from acts_contrib.test_utils.tel.tel_voice_utils import wait_and_reject_call_for_subscription
CallResult = TelephonyVoiceTestResult.CallResult.Value
+
def dsds_voice_call_test(
log,
tel_logger,