From f9a5f71bf50fb3d8b2032203c571011569784406 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Sun, 18 Oct 2020 17:03:28 -0700
Subject: [PATCH] NEOS 15 (#2084)

* doze

* need a new apk

* new build

* neos 15 part 1

* new build to re-enable display control for ft8716

* production image
---
 RELEASES.md                          |  1 +
 apk/ai.comma.plus.offroad.apk        |  4 ++--
 installer/updater/update.json        | 10 +++++-----
 installer/updater/update_kernel.json |  7 -------
 launch_chffrplus.sh                  |  4 ----
 launch_env.sh                        |  2 +-
 release/files_common                 |  1 -
 selfdrive/ui/android/ui.cc           |  2 +-
 8 files changed, 10 insertions(+), 21 deletions(-)
 delete mode 100644 installer/updater/update_kernel.json

diff --git a/RELEASES.md b/RELEASES.md
index 3a27f36b..5ef42daf 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -1,5 +1,6 @@
 Version 0.7.10 (2020-10-XX)
 ========================
+ * NEOS update
 
 Version 0.7.9 (2020-10-09)
 ========================
diff --git a/apk/ai.comma.plus.offroad.apk b/apk/ai.comma.plus.offroad.apk
index 75f3b219..472f894b 100644
--- a/apk/ai.comma.plus.offroad.apk
+++ b/apk/ai.comma.plus.offroad.apk
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a198491887ed6029bffdf7f4dc28c4f9a6ba5f9d2235710fc11a1378893491d7
-size 13702777
+oid sha256:b3290c11ee8ededb1dc268aa24000c0831565c64d32ac9ce6521bfef2161b6e6
+size 13702753
diff --git a/installer/updater/update.json b/installer/updater/update.json
index 6e2692bf..ef02bfae 100644
--- a/installer/updater/update.json
+++ b/installer/updater/update.json
@@ -1,7 +1,7 @@
 {
-  "ota_url": "https://commadist.azureedge.net/neosupdate/ota-signed-efdf7de63b1aef63d68301e6175930991bf9a5927d16ec6fcc69287e2ee7ca4a.zip",
-  "ota_hash": "efdf7de63b1aef63d68301e6175930991bf9a5927d16ec6fcc69287e2ee7ca4a",
-  "recovery_url": "https://commadist.azureedge.net/neosupdate/recovery-97c27e6ed04ed6bb0608b845a2d4100912093f9380c3f2ba6b56bccd608e5f6e.img",
-  "recovery_len": 15861036,
-  "recovery_hash": "97c27e6ed04ed6bb0608b845a2d4100912093f9380c3f2ba6b56bccd608e5f6e"
+  "ota_url": "https://commadist.azureedge.net/neosupdate/ota-signed-e85f507777cb6b22f88ba1c8be6bbaa2630c484b971344b645fca2d1c461cd47.zip",
+  "ota_hash": "e85f507777cb6b22f88ba1c8be6bbaa2630c484b971344b645fca2d1c461cd47",
+  "recovery_url": "https://commadist.azureedge.net/neosupdate/recovery-db31ffe79dfd60be966fba6d1525a5081a920062b883644dc8f5734bcc6806bb.img",
+  "recovery_len": 15926572,
+  "recovery_hash": "db31ffe79dfd60be966fba6d1525a5081a920062b883644dc8f5734bcc6806bb"
 }
diff --git a/installer/updater/update_kernel.json b/installer/updater/update_kernel.json
deleted file mode 100644
index 41dc595b..00000000
--- a/installer/updater/update_kernel.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "ota_url": "https://commadist.azureedge.net/neosupdate/ota-signed-3bd2b3bdd6a501569e00b8f12786d65e0fd2788c0dd238f8c986e3e2e504683a-kernel.zip",
-  "ota_hash": "3bd2b3bdd6a501569e00b8f12786d65e0fd2788c0dd238f8c986e3e2e504683a",
-  "recovery_url": "https://commadist.azureedge.net/neosupdate/recovery-97c27e6ed04ed6bb0608b845a2d4100912093f9380c3f2ba6b56bccd608e5f6e.img",
-  "recovery_len": 15861036,
-  "recovery_hash": "97c27e6ed04ed6bb0608b845a2d4100912093f9380c3f2ba6b56bccd608e5f6e"
-}
diff --git a/launch_chffrplus.sh b/launch_chffrplus.sh
index 47eead99..7d27f1c6 100755
--- a/launch_chffrplus.sh
+++ b/launch_chffrplus.sh
@@ -43,10 +43,6 @@ function two_init {
     fi
 
     "$DIR/installer/updater/updater" "file://$DIR/installer/updater/update.json"
-  else
-    if [[ $(uname -v) == "#1 SMP PREEMPT Wed Jun 10 12:40:53 PDT 2020" ]]; then
-      "$DIR/installer/updater/updater" "file://$DIR/installer/updater/update_kernel.json"
-    fi
   fi
 
   # One-time fix for a subset of OP3T with gyro orientation offsets.
diff --git a/launch_env.sh b/launch_env.sh
index 9a86d315..ca8f4e8a 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="14"
+  export REQUIRED_NEOS_VERSION="15-1"
 fi
 
 if [ -z "$PASSIVE" ]; then
diff --git a/release/files_common b/release/files_common
index 04ee8b96..976458b7 100644
--- a/release/files_common
+++ b/release/files_common
@@ -446,7 +446,6 @@ phonelibs/android_system_core/**
 installer/updater/updater
 installer/updater/updater.cc
 installer/updater/update.json
-installer/updater/update_kernel.json
 installer/updater/Makefile
 
 scripts/update_now.sh
diff --git a/selfdrive/ui/android/ui.cc b/selfdrive/ui/android/ui.cc
index 2d5f3490..4ec5687f 100644
--- a/selfdrive/ui/android/ui.cc
+++ b/selfdrive/ui/android/ui.cc
@@ -54,7 +54,7 @@ static void handle_display_state(UIState *s, bool user_input) {
   } else {
     display_timeout = std::max(display_timeout-1, 0);
     if (display_timeout == 0) {
-      desired_mode = HWC_POWER_MODE_OFF;
+      desired_mode = HWC_POWER_MODE_DOZE;
     }
   }