summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSarah Boechat <monikermine@google.com>2019-11-08 11:15:47 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-08 11:15:47 -0800
commit4a1948478f31e1e74f910b9d4595c0b43cb63bba (patch)
tree6054eade3e79e20fcd1bdb33cb58d76d99603ccf
parentf141c6464a4b6776cc99f8208d60e546eb13bb7b (diff)
parent8e11b0acc8e0c8dc4a64069541d83d696a0d788b (diff)
downloadplatform_tools_test_connectivity-4a1948478f31e1e74f910b9d4595c0b43cb63bba.tar.gz
platform_tools_test_connectivity-4a1948478f31e1e74f910b9d4595c0b43cb63bba.tar.bz2
platform_tools_test_connectivity-4a1948478f31e1e74f910b9d4595c0b43cb63bba.zip
Merge "Adding multi-sim handling to get_service_state_by_adb" am: 142fdd41ed
am: 8e11b0acc8 Change-Id: Ie9782c480054dbe742ffd9db06af29979a8cfee1
-rw-r--r--acts/framework/acts/test_utils/tel/tel_test_utils.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/acts/framework/acts/test_utils/tel/tel_test_utils.py b/acts/framework/acts/test_utils/tel/tel_test_utils.py
index 9b88cc10a9..323e1bc1e0 100644
--- a/acts/framework/acts/test_utils/tel/tel_test_utils.py
+++ b/acts/framework/acts/test_utils/tel/tel_test_utils.py
@@ -802,6 +802,15 @@ def get_service_state_by_adb(log, ad):
ad.log.info("mVoiceRegState is %s %s", result.group(1),
result.group(2))
return result.group(2)
+ else:
+ if getattr(ad, "sdm_log", False):
+ #look for all occurrence in string
+ result2 = re.findall(r"mVoiceRegState=(\S+)\((\S+)\)", output)
+ for voice_state in result2:
+ if voice_state[0] == 0:
+ ad.log.info("mVoiceRegState is 0 %s", voice_state[1])
+ return voice_state[1]
+ return result2[1][1]
else:
result = re.search(r"mServiceState=(\S+)", output)
if result: