Fix the Exception typo in setup_droid_properties. am: 2d89192a47
am: c5b6092e51
Change-Id: Icd560768d4294aa98855bb08c8e8dcecd2fe6a74
diff --git a/acts/framework/acts/controllers/android.py b/acts/framework/acts/controllers/android.py
index cdd1412..defa3a4 100644
--- a/acts/framework/acts/controllers/android.py
+++ b/acts/framework/acts/controllers/android.py
@@ -115,7 +115,8 @@
raise SL4AProtocolError(SL4AProtocolError.NO_RESPONSE_FROM_SERVER)
result = json.loads(str(response, encoding="utf8"))
if result['error']:
- raise SL4AAPIError(result['error'])
+ raise SL4AAPIError(
+ "RPC call %s failed with error %s" % (method, result['error']))
if result['id'] != apiid:
raise SL4AProtocolError(SL4AProtocolError.MISMATCHED_API_ID)
return result['result']
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 ce02465..f5cb105 100644
--- a/acts/framework/acts/test_utils/tel/tel_test_utils.py
+++ b/acts/framework/acts/test_utils/tel/tel_test_utils.py
@@ -166,7 +166,7 @@
except KeyError:
number = ad.droid.telephonyGetLine1NumberForSubscription(
sub_id)
- except Except as e:
+ except Exception as e:
log.error("Failed to setup_droid_property with {}".format(e))
raise
if not number or number == "":
