From b5a7a39a399fbe8cfa8ea1adca2f2af47a1033d7 Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Sun, 19 Jan 2020 09:39:54 -0800 Subject: [PATCH 1/5] Panda signature needs to be bytes --- selfdrive/pandad.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/pandad.py b/selfdrive/pandad.py index 7cbc704b9..12d6719fc 100755 --- a/selfdrive/pandad.py +++ b/selfdrive/pandad.py @@ -58,7 +58,7 @@ def update_panda(): serial = None panda_version = "bootstub" if panda.bootstub else panda.get_version() - panda_signature = "bootstub" if panda.bootstub else panda.get_signature() + panda_signature = b"" if panda.bootstub else panda.get_signature() cloudlog.warning("Panda %s connected, version: %s, signature %s, expected %s" % ( serial, panda_version, From de2ccfedbc27f46a8cc69ad8455098811434e21b Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Sun, 19 Jan 2020 14:00:39 -0800 Subject: [PATCH 2/5] update offroad apk: fix pairing From 0eb1b1b6a3bedcd604932cfaaca89976b9d18da5 Mon Sep 17 00:00:00 2001 From: andyh2 Date: Sun, 19 Jan 2020 18:05:31 -0500 Subject: [PATCH 3/5] apk lib: Grant offroad access to TelephonyManager --- common/apk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/common/apk.py b/common/apk.py index 064696f10..32bd2f54c 100644 --- a/common/apk.py +++ b/common/apk.py @@ -32,6 +32,7 @@ def start_frame(): def set_package_permissions(): pm_grant("ai.comma.plus.offroad", "android.permission.ACCESS_FINE_LOCATION") + pm_grant("ai.comma.plus.offroad", "android.permission.READ_PHONE_STATE") appops_set("ai.comma.plus.offroad", "SU", "allow") appops_set("ai.comma.plus.offroad", "WIFI_SCAN", "allow") appops_set("ai.comma.plus.offroad", "READ_EXTERNAL_STORAGE", "allow") From 30a194a38dab49babe3e446bff79fd65a668c5ab Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Sun, 19 Jan 2020 16:06:26 -0800 Subject: [PATCH 4/5] update frame apk From 355b92d7d47b08a9246f7ad3ac2e93b1c67aebff Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Mon, 20 Jan 2020 11:30:04 -0800 Subject: [PATCH 5/5] catch exception in uploader.py --- selfdrive/loggerd/uploader.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/selfdrive/loggerd/uploader.py b/selfdrive/loggerd/uploader.py index 8f7e0a67a..6067f01ed 100644 --- a/selfdrive/loggerd/uploader.py +++ b/selfdrive/loggerd/uploader.py @@ -67,11 +67,13 @@ def clear_locks(root): def is_on_wifi(): # ConnectivityManager.getActiveNetworkInfo() try: - result = android.parse_service_call_string(["connectivity", "2"]) + # TODO: figure out why the android service call sometimes dies with SIGUSR2 (signal from MSGQ) + result = android.parse_service_call_string(android.service_call(["connectivity", "2"])) if result is None: return True return 'WIFI' in result - except AttributeError: + except (AttributeError, subprocess.CalledProcessError): + cloudlog.exception("is_on_wifi failed") return False def is_on_hotspot():