commit b32e35d0f6aa704b2983620ef32e3d8dd6e904d2
author Treehugger Robot <treehugger-gerrit@google.com> Fri Apr 29 23:22:06 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 29 23:22:06 2022 +0000
tree 1983f32ecca15fb11ec7580b984dc70c62bf0791
parent 8b933d52a39747bb2757c34185e4f05605da4260
parent 63c385f71b1e02f25e2448893c2dc3ae40846127

Merge "Remove erroneous parameter to init"

acts/framework/acts/controllers/rohdeschwarz_lib/cmx500.py

diff --git a/acts/framework/acts/controllers/rohdeschwarz_lib/cmx500.py b/acts/framework/acts/controllers/rohdeschwarz_lib/cmx500.py
index 18c5ab3..cb2f66e 100644
--- a/acts/framework/acts/controllers/rohdeschwarz_lib/cmx500.py
+++ b/acts/framework/acts/controllers/rohdeschwarz_lib/cmx500.py
@@ -143,10 +143,11 @@
     TM9 = 9
 
 
+# For mimo 1x1, also set_num_crs_antenna_ports to 1
 MIMO_MAX_LAYER_MAPPING = {
-    MimoModes.MIMO1x1: 1,
+    MimoModes.MIMO1x1: 2,
     MimoModes.MIMO2x2: 2,
-    MimoModes.MIMO4x4: 3,
+    MimoModes.MIMO4x4: 4,
 }
 
 

acts_tests/acts_contrib/test_utils/tel/tel_ims_utils.py

diff --git a/acts_tests/acts_contrib/test_utils/tel/tel_ims_utils.py b/acts_tests/acts_contrib/test_utils/tel/tel_ims_utils.py
index 4001f9b..ea9423e 100644
--- a/acts_tests/acts_contrib/test_utils/tel/tel_ims_utils.py
+++ b/acts_tests/acts_contrib/test_utils/tel/tel_ims_utils.py
@@ -396,6 +396,8 @@
                 return True
 
             ad.log.info("Set wfc mode to %s for sub ID %s.", wfc_mode, sub_id)
+            ad.root_adb()
+            ad.adb.shell("setprop dbg.force_wfc_activated true")
             ad.droid.imsMmTelSetVoWiFiModeSetting(sub_id, wfc_mode)
             mode = ad.droid.imsMmTelGetVoWiFiModeSetting(sub_id)
             if mode != wfc_mode: