From 949ff0b921959c9a6938380f25f8eec40d760b6a Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Fri, 4 Feb 2022 22:54:12 -0800
Subject: [PATCH] NEOS 19.1 (#23707)

* NEOS 19.1

* add logging

* new manifest

* prod bucket

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 62e0bd5f0d40b0ce1be171332d50de618ef5d51c
---
 launch_env.sh                      |  2 +-
 selfdrive/hardware/eon/androidd.py | 13 +++++++++++++
 selfdrive/hardware/eon/neos.json   | 10 +++++-----
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/launch_env.sh b/launch_env.sh
index a25d9f0385..95e0f0c8ac 100755
--- a/launch_env.sh
+++ b/launch_env.sh
@@ -7,7 +7,7 @@ export OPENBLAS_NUM_THREADS=1
 export VECLIB_MAXIMUM_THREADS=1
 
 if [ -z "$REQUIRED_NEOS_VERSION" ]; then
-  export REQUIRED_NEOS_VERSION="19"
+  export REQUIRED_NEOS_VERSION="19.1"
 fi
 
 if [ -z "$AGNOS_VERSION" ]; then
diff --git a/selfdrive/hardware/eon/androidd.py b/selfdrive/hardware/eon/androidd.py
index 809d1322d1..dd26f64dce 100755
--- a/selfdrive/hardware/eon/androidd.py
+++ b/selfdrive/hardware/eon/androidd.py
@@ -4,6 +4,7 @@ import time
 import psutil
 from typing import Optional
 
+import cereal.messaging as messaging
 from common.realtime import set_core_affinity, set_realtime_priority
 from selfdrive.swaglog import cloudlog
 
@@ -37,6 +38,8 @@ def main():
   crash_count = 0
   modem_killed = False
   modem_state = "ONLINE"
+  androidLog = messaging.sub_sock('androidLog')
+
   while True:
     # check critical android services
     if any(p is None or not p.is_running() for p in procs.values()) or not len(procs):
@@ -52,6 +55,16 @@ def main():
             cloudlog.event("android service pid changed", proc=p, cur=cur[p], prev=procs[p], error=True)
       procs.update(cur)
 
+    # log caught NetworkPolicy exceptions
+    msgs = messaging.drain_sock(androidLog)
+    for m in msgs:
+      try:
+        if m.androidLog.tag == "NetworkPolicy" and m.androidLog.message.startswith("problem with advise persist threshold"):
+          print(m)
+          cloudlog.event("network policy exception caught", androidLog=m.androidLog, error=True)
+      except UnicodeDecodeError:
+        pass
+
     if os.path.exists(MODEM_PATH):
       # check modem state
       state = get_modem_state()
diff --git a/selfdrive/hardware/eon/neos.json b/selfdrive/hardware/eon/neos.json
index 80fe60fbfb..4010f7126a 100644
--- a/selfdrive/hardware/eon/neos.json
+++ b/selfdrive/hardware/eon/neos.json
@@ -1,7 +1,7 @@
 {
-  "ota_url": "https://commadist.azureedge.net/neosupdate/ota-signed-b408d512a0d4f31ae4aa96bdee49ab9281bdc40a64f4c234943c0bed6bcaf227.zip",
-  "ota_hash": "b408d512a0d4f31ae4aa96bdee49ab9281bdc40a64f4c234943c0bed6bcaf227",
-  "recovery_url": "https://commadist.azureedge.net/neosupdate/recovery-c3944a405ebbb39e279560bfe2fbcbb0899aec71cf3c2f3c18825ca0e335b227.img",
-  "recovery_len": 15201580,
-  "recovery_hash": "c3944a405ebbb39e279560bfe2fbcbb0899aec71cf3c2f3c18825ca0e335b227"
+  "ota_url": "https://commadist.azureedge.net/neosupdate/ota-signed-50da8800caa5cbc224acbaa21f3a83d21802a31d89cccfc62a898903a8eb19e7.zip",
+  "ota_hash": "50da8800caa5cbc224acbaa21f3a83d21802a31d89cccfc62a898903a8eb19e7",
+  "recovery_url": "https://commadist.azureedge.net/neosupdate/recovery-fe76739438d28ea6111853a737b616afdf340ba75c01c0ee99e6a28c19ecc29f.img",
+  "recovery_len": 15222060,
+  "recovery_hash": "fe76739438d28ea6111853a737b616afdf340ba75c01c0ee99e6a28c19ecc29f"
 }