From 10065c8c288598ca4cce1c4e01d2dad68f4790bb Mon Sep 17 00:00:00 2001
From: Shane Smiskol <shane@smiskol.com>
Date: Fri, 13 Feb 2026 17:02:42 -0800
Subject: [PATCH] WifiManager: handle failed state change (#37205)

* handle connecting to network that drops out w/ wrong password (no longer says connected and now deletes connection)

* clean up

* combine
---
 selfdrive/ui/mici/layouts/settings/network/wifi_ui.py | 5 +++--
 system/ui/lib/networkmanager.py                       | 2 ++
 system/ui/lib/wifi_manager.py                         | 8 ++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/selfdrive/ui/mici/layouts/settings/network/wifi_ui.py b/selfdrive/ui/mici/layouts/settings/network/wifi_ui.py
index d25b28d63..1c11c0973 100644
--- a/selfdrive/ui/mici/layouts/settings/network/wifi_ui.py
+++ b/selfdrive/ui/mici/layouts/settings/network/wifi_ui.py
@@ -367,8 +367,9 @@ class WifiUIMici(BigMultiOptionDialog):
     self._update_buttons()
 
   def _open_network_manage_page(self, result=None):
-    self._network_info_page.update_networks(self._networks)
-    gui_app.set_modal_overlay(self._network_info_page)
+    if self._network_info_page._network is not None and self._network_info_page._network.ssid in self._networks:
+      self._network_info_page.update_networks(self._networks)
+      gui_app.set_modal_overlay(self._network_info_page)
 
   def _forget_network(self, ssid: str):
     network = self._networks.get(ssid)
diff --git a/system/ui/lib/networkmanager.py b/system/ui/lib/networkmanager.py
index ffa2ff4db..19d54e651 100644
--- a/system/ui/lib/networkmanager.py
+++ b/system/ui/lib/networkmanager.py
@@ -11,6 +11,7 @@ class NMDeviceState(IntEnum):
   IP_CONFIG = 70
   ACTIVATED = 100
   DEACTIVATING = 110
+  FAILED = 120
 
 
 # NetworkManager constants
@@ -29,6 +30,7 @@ NM_IP4_CONFIG_IFACE = 'org.freedesktop.NetworkManager.IP4Config'
 
 NM_DEVICE_TYPE_WIFI = 2
 NM_DEVICE_TYPE_MODEM = 8
+NM_DEVICE_STATE_REASON_NO_SECRETS = 7
 NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT = 8
 NM_DEVICE_STATE_REASON_NEW_ACTIVATION = 60
 
diff --git a/system/ui/lib/wifi_manager.py b/system/ui/lib/wifi_manager.py
index 2dfbe63cc..187199b5c 100644
--- a/system/ui/lib/wifi_manager.py
+++ b/system/ui/lib/wifi_manager.py
@@ -23,7 +23,8 @@ from openpilot.system.ui.lib.networkmanager import (NM, NM_WIRELESS_IFACE, NM_80
                                                     NM_802_11_AP_FLAGS_PRIVACY, NM_802_11_AP_FLAGS_WPS,
                                                     NM_PATH, NM_IFACE, NM_ACCESS_POINT_IFACE, NM_SETTINGS_PATH,
                                                     NM_SETTINGS_IFACE, NM_CONNECTION_IFACE, NM_DEVICE_IFACE,
-                                                    NM_DEVICE_TYPE_WIFI, NM_DEVICE_TYPE_MODEM, NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT,
+                                                    NM_DEVICE_TYPE_WIFI, NM_DEVICE_TYPE_MODEM, NM_DEVICE_STATE_REASON_NO_SECRETS,
+                                                    NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT,
                                                     NM_DEVICE_STATE_REASON_NEW_ACTIVATION, NM_ACTIVE_CONNECTION_IFACE,
                                                     NM_IP4_CONFIG_IFACE, NM_PROPERTIES_IFACE, NMDeviceState)
 
@@ -319,7 +320,10 @@ class WifiManager:
           new_state, previous_state, change_reason = state_q.popleft().body
 
           # BAD PASSWORD
-          if new_state == NMDeviceState.NEED_AUTH and change_reason == NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT and len(self._connecting_to_ssid):
+          # - strong network rejects with NEED_AUTH+SUPPLICANT_DISCONNECT
+          # - weak/gone network fails with FAILED+NO_SECRETS
+          if len(self._connecting_to_ssid) and ((new_state == NMDeviceState.NEED_AUTH and change_reason == NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT) or
+                                                (new_state == NMDeviceState.FAILED and change_reason == NM_DEVICE_STATE_REASON_NO_SECRETS)):
             self._enqueue_callbacks(self._need_auth, self._connecting_to_ssid)
             self.forget_connection(self._connecting_to_ssid, block=True)
             self._connecting_to_ssid = ""