From 460a8e318995e0d0aa39112aa609cb3fb6add933 Mon Sep 17 00:00:00 2001
From: Willem Melching <willem.melching@gmail.com>
Date: Mon, 20 Jan 2020 11:30:04 -0800
Subject: [PATCH] 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 8f7e0a67a4716d..6067f01ed6e21c 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():