commit 9962988c686e5d1be2904bdbc7bf67615611a443
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 20 00:09:10 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 20 00:09:10 2020 +0000
tree ed394c49bbf634282d4cff0e0c100cefebdb7c8c
parent ed04f5652133c781614fdcc5e5eca52e29a032ba
parent fa29a1cfe261fe65487bd824f138bae4e512dffc

Merge "Exception handling for SL4A APIs" am: efe653ff8e am: b6ad48e219 am: fa29a1cfe2

Change-Id: Ib77ffd871bc836a92d0d841ce83043c32444c459

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 2fd6796..69bb67b 100644
--- a/acts/framework/acts/test_utils/tel/TelephonyBaseTest.py
+++ b/acts/framework/acts/test_utils/tel/TelephonyBaseTest.py
@@ -334,7 +334,10 @@
         if getattr(ad, "telephony_test_setup", None):
             return True
 
-        ad.droid.wifiEnableVerboseLogging(WIFI_VERBOSE_LOGGING_ENABLED)
+        try:
+            ad.droid.wifiEnableVerboseLogging(WIFI_VERBOSE_LOGGING_ENABLED)
+        except Exception:
+            pass
 
         # Disable Emergency alerts
         # Set chrome browser start with no-first-run verification and
@@ -348,7 +351,7 @@
                     "am set-debug-app --persistent com.android.chrome",
                     'echo "chrome --no-default-browser-check --no-first-run '
                     '--disable-fre" > /data/local/tmp/chrome-command-line'):
-            ad.adb.shell(cmd)
+            ad.adb.shell(cmd, ignore_status=True)
 
         # Curl for 2016/7 devices
         if not getattr(ad, "curl_capable", False):