From decf24d775375485581cd9707500dc9a02c5101d Mon Sep 17 00:00:00 2001 From: Justin Newberry Date: Tue, 14 Nov 2023 16:57:34 -0800 Subject: [PATCH] thermald: recover from modemmanager restart (#30464) * test modem recovery * static analysis * also test lte reload * this should just be try catched as well * maybe we can find a better way than this * rm the test * make it clear --------- Co-authored-by: Comma Device old-commit-hash: f99939426f5f654ee7c59ab39689454f58905451 --- system/hardware/tici/hardware.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/hardware/tici/hardware.py b/system/hardware/tici/hardware.py index 8b1f9abe74..3b5647cc56 100644 --- a/system/hardware/tici/hardware.py +++ b/system/hardware/tici/hardware.py @@ -105,7 +105,7 @@ class Tici(HardwareBase): def nm(self): return self.bus.get_object(NM, '/org/freedesktop/NetworkManager') - @cached_property + @property # this should not be cached, in case the modemmanager restarts def mm(self): return self.bus.get_object(MM, '/org/freedesktop/ModemManager1') @@ -211,8 +211,8 @@ class Tici(HardwareBase): return str(self.get_modem().Get(MM_MODEM, 'EquipmentIdentifier', dbus_interface=DBUS_PROPS, timeout=TIMEOUT)) def get_network_info(self): - modem = self.get_modem() try: + modem = self.get_modem() info = modem.Command("AT+QNWINFO", math.ceil(TIMEOUT), dbus_interface=MM_MODEM, timeout=TIMEOUT) extra = modem.Command('AT+QENG="servingcell"', math.ceil(TIMEOUT), dbus_interface=MM_MODEM, timeout=TIMEOUT) state = modem.Get(MM_MODEM, 'State', dbus_interface=DBUS_PROPS, timeout=TIMEOUT)