From b857f65de873d94a91aaeac8f16dda5aa3854409 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Fri, 11 Sep 2020 13:45:41 -0700 Subject: [PATCH] handle exception in android service call --- common/android.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/common/android.py b/common/android.py index 8fd69acd07..91e1d1423e 100644 --- a/common/android.py +++ b/common/android.py @@ -13,12 +13,14 @@ NetworkStrength = log.ThermalData.NetworkStrength def service_call(call): - ret = subprocess.check_output(["service", "call", *call], encoding='utf8').strip() - if 'Parcel' not in ret: + try: + ret = subprocess.check_output(["service", "call", *call], encoding='utf8').strip() + if 'Parcel' not in ret: + return None + return parse_service_call_bytes(ret) + except subprocess.CalledProcessError: return None - return parse_service_call_bytes(ret) - def parse_service_call_unpack(r, fmt): try: