commit 84e9414d4f9585a7e9b38eccda60317e7aa17155
author Betty Zhou <bettyzhou@google.com> Mon Dec 19 17:47:01 2016 -0800
committer Betty Zhou <bettyzhou@google.com> Tue Dec 20 14:45:59 2016 -0800
tree 94ab2f527922380dcc5fc30400700fc5cb28438c
parent 163b53a1e05783c26cc18cd9844fbec21faa6fc4

Config VoWiFi only on devices with Verizon sim.

Test: run test in lab
Bug: 33187374
Change-Id: I874ef04a759f7287ea0c4d7e9645c8501b6a5e35

acts/framework/acts/test_utils/tel/TelephonyBaseTest.py

diff --git a/acts/framework/acts/test_utils/tel/TelephonyBaseTest.py b/acts/framework/acts/test_utils/tel/TelephonyBaseTest.py
index 9a2589f..5c21035 100644
--- a/acts/framework/acts/test_utils/tel/TelephonyBaseTest.py
+++ b/acts/framework/acts/test_utils/tel/TelephonyBaseTest.py
@@ -175,16 +175,16 @@
             setup_droid_properties(self.log, ad, sim_conf_file)
 
             # Setup VoWiFi MDN for Verizon. b/33187374
-            if ad.build_info["build_id"].startswith("N2"):
-                ad.log.info("setup VoWiFi MDN for NYC-MR2 branch for b/33187374")
+            build_id = ad.build_info["build_id"]
+            if "vzw" in [sub["operator"] for sub in ad.cfg[
+                    "subscription"].values()] and ad.model in (
+                            "marlin", "sailfish") and (build_id.startswith(
+                                    "N2") or build_id.startswith("OR")):
+                ad.log.info("setup VoWiFi MDN for MR2 or OC branch per b/33187374")
                 ad.adb.shell("setprop dbg.vzw.force_wfc_nv_enabled true")
                 ad.adb.shell("am start --ei EXTRA_LAUNCH_CARRIER_APP 0 -n "
-                "\"com.google.android.carrierentitlement/.VzwEmergencyAddressActivity\"")
-            elif ad.build_info["build_id"].startswith("OR"):
-                ad.log.info("setup VoWiFi MDN for OC branch for b/33187374")
-                ad.adb.shell("setprop dbg.vzw.force_wfc_nv_enabled true")
-                ad.adb.shell("am start --ei EXTRA_LAUNCH_CARRIER_APP 0 -n "
-                "\"com.google.android.wfcactivation/.VzwEmergencyAddressActivity\"")
+                             "\"com.google.android.wfcactivation/"
+                             ".VzwEmergencyAddressActivity\"")
 
             # Ensure that a test class starts from a consistent state that
             # improves chances of valid network selection and facilitates