Update the judgement of sim_mode for the new projects.
Bug: 221798276
Test: Yes, locally
Change-Id: I6b65ef1697accd12ee5965240cfb62adf02e2f34
diff --git a/acts_tests/acts_contrib/test_utils/tel/tel_data_utils.py b/acts_tests/acts_contrib/test_utils/tel/tel_data_utils.py
index 80f1a73..0b6856e 100644
--- a/acts_tests/acts_contrib/test_utils/tel/tel_data_utils.py
+++ b/acts_tests/acts_contrib/test_utils/tel/tel_data_utils.py
@@ -709,6 +709,7 @@
voice_subid = get_outgoing_voice_sub_id(ad)
sms_subid = get_outgoing_message_sub_id(ad)
+ sim_mode_before_reboot = ad.droid.telephonyGetPhoneCount()
data_rat_before_reboot = get_network_rat_for_subscription(
log, ad, data_subid, NETWORK_SERVICE_DATA)
voice_rat_before_reboot = get_network_rat_for_subscription(
@@ -732,19 +733,23 @@
return False
- sim_mode = ad.droid.telephonyGetPhoneCount()
+ sim_mode_after_reboot = ad.droid.telephonyGetPhoneCount()
+
+ if sim_mode_after_reboot != sim_mode_before_reboot:
+ ad.log.error(
+ "SIM mode changed! (Before reboot: %s; after reboot: %s)",
+ sim_mode_before_reboot, sim_mode_after_reboot)
+ return False
+
if getattr(ad, 'dsds', False):
- if sim_mode == 1:
+ if sim_mode_after_reboot == 1:
ad.log.error("Phone is in single SIM mode after reboot.")
return False
- elif sim_mode == 2:
+ elif sim_mode_after_reboot == 2:
ad.log.info("Phone keeps being in dual SIM mode after reboot.")
else:
- if sim_mode == 1:
+ if sim_mode_after_reboot == 1:
ad.log.info("Phone keeps being in single SIM mode after reboot.")
- elif sim_mode == 2:
- ad.log.error("Phone is in dual SIM mode after reboot.")
- return False
data_subid_after_reboot = get_default_data_sub_id(ad)
if data_subid_after_reboot != data_subid:
