commit 7043ef8c34264b4f3b05b76425ced0b89500b19b
author Qi Jiang <qijiang@google.com> Mon Apr 09 23:04:44 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 09 23:04:44 2018 -0700
tree 0747d9300bfc7a72ec26e48c489669e1745ec1d8
parent 212a3bae0476dea4d7f305e40759d60f8e92c929
parent c6afc689ed2e6267ef1467a7b64050a3c0bb2992

Merge "Catch sl4a error  when NFC is not available" am: 6530170600 am: 366c84e197 am: 1c542f61af am: 99cb7b10c8
am: c6afc689ed

Change-Id: I9764fe9f421242c28f0531c5f054254426f9fddc

acts/framework/acts/test_utils/wifi/wifi_power_test_utils.py

diff --git a/acts/framework/acts/test_utils/wifi/wifi_power_test_utils.py b/acts/framework/acts/test_utils/wifi/wifi_power_test_utils.py
index 3e65113..7ed63cd 100644
--- a/acts/framework/acts/test_utils/wifi/wifi_power_test_utils.py
+++ b/acts/framework/acts/test_utils/wifi/wifi_power_test_utils.py
@@ -14,6 +14,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
+import acts
 import json
 import logging
 import os
@@ -94,7 +95,10 @@
     utils.disable_doze(ad)
     wutils.reset_wifi(ad)
     wutils.wifi_toggle_state(ad, False)
-    ad.droid.nfcDisable()
+    try:
+        ad.droid.nfcDisable()
+    except acts.controllers.sl4a_lib.rpc_client.Sl4aApiError:
+        ad.log.info('NFC is not available')
     ad.droid.setScreenBrightness(0)
     ad.adb.shell(AOD_OFF)
     ad.droid.setScreenTimeout(2200)