From e9ec11bbe2c33d5be37ce0d37ff0327a2973709f Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Thu, 16 Jan 2020 11:43:09 -0800 Subject: [PATCH] registration: send up both imeis old-commit-hash: 7c25bb6950e94f7ae920cfbe96b89f3e54228eab --- common/android.py | 10 +++++++--- selfdrive/registration.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/common/android.py b/common/android.py index e58b0e56e5..e88080884c 100644 --- a/common/android.py +++ b/common/android.py @@ -12,9 +12,13 @@ def getprop(key): return "" return subprocess.check_output(["getprop", key], encoding='utf8').strip() -def get_imei(): - ret = getprop("oem.device.imeicache") - if ret == "": +def get_imei(slot): + slot = str(slot) + if slot not in ("0", "1"): + raise ValueError("SIM slot must be 0 or 1") + + ret = parse_service_call_string(["iphonesubinfo", "3" ,"i32", str(slot)]) + if not ret: ret = "000000000000000" return ret diff --git a/selfdrive/registration.py b/selfdrive/registration.py index 5de1ec99bd..afa2771bc1 100644 --- a/selfdrive/registration.py +++ b/selfdrive/registration.py @@ -48,7 +48,7 @@ def register(): try: cloudlog.info("getting pilotauth") resp = api_get("v2/pilotauth/", method='POST', timeout=15, - imei=get_imei(), serial=get_serial(), public_key=public_key, register_token=register_token) + imei=get_imei(0), imei2=get_imei(1), serial=get_serial(), public_key=public_key, register_token=register_token) dongleauth = json.loads(resp.text) dongle_id, access_token = dongleauth["dongle_id"], dongleauth["access_token"]