Mirrors
/
Sideband
mirror of https://github.com/markqvist/Sideband.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added handling of missing access to WiFi Manager and Power Manager on Android

This commit is contained in:
Mark Qvist 2024-03-19 11:55:52 +01:00
parent e800ce054b
commit b87b80f152
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
sbapp/services/sidebandservice.py
View File

@ -209,9 +209,20 @@ class SidebandService():
if RNS.vendor.platformutils.is_android(): if RNS.vendor.platformutils.is_android():
self.android_service = autoclass('org.kivy.android.PythonService').mService self.android_service = autoclass('org.kivy.android.PythonService').mService
self.app_context = self.android_service.getApplication().getApplicationContext() self.app_context = self.android_service.getApplication().getApplicationContext()
self.wifi_manager = self.app_context.getSystemService(Context.WIFI_SERVICE)
self.power_manager = self.app_context.getSystemService(Context.POWER_SERVICE) try:
# The returned instance /\ is an android.net.wifi.WifiManager self.wifi_manager = self.app_context.getSystemService(Context.WIFI_SERVICE)
except Exception as e:
self.wifi_manager = None
RNS.log("Could not acquire Android WiFi Manager! Keeping WiFi-based interfaces up will be unavailable.", RNS.LOG_ERROR)
RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
try:
self.power_manager = self.app_context.getSystemService(Context.POWER_SERVICE)
except Exception as e:
self.power_manager = None
RNS.log("Could not acquire Android Power Manager! Taking wakelocks and keeping the CPU running will be unavailable.", RNS.LOG_ERROR)
RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
self.discover_usb_devices() self.discover_usb_devices()
@ -259,24 +270,28 @@ class SidebandService():
def take_locks(self, force_multicast=False): def take_locks(self, force_multicast=False):
if RNS.vendor.platformutils.get_platform() == "android": if RNS.vendor.platformutils.get_platform() == "android":
if self.multicast_lock == None or force_multicast: if self.multicast_lock == None or force_multicast:
RNS.log("Creating multicast lock", RNS.LOG_DEBUG) if self.wifi_manager != None:
self.multicast_lock = self.wifi_manager.createMulticastLock("sideband_service") RNS.log("Creating multicast lock", RNS.LOG_DEBUG)
self.multicast_lock = self.wifi_manager.createMulticastLock("sideband_service")
if not self.multicast_lock.isHeld(): if self.multicast_lock != None:
RNS.log("Taking multicast lock", RNS.LOG_DEBUG) if not self.multicast_lock.isHeld():
self.multicast_lock.acquire() RNS.log("Taking multicast lock", RNS.LOG_DEBUG)
else: self.multicast_lock.acquire()
RNS.log("Multicast lock already held", RNS.LOG_DEBUG) else:
RNS.log("Multicast lock already held", RNS.LOG_DEBUG)
if self.wake_lock == None: if self.wake_lock == None:
RNS.log("Creating wake lock", RNS.LOG_DEBUG) if self.power_manager != None:
self.wake_lock = self.power_manager.newWakeLock(self.power_manager.PARTIAL_WAKE_LOCK, "sideband_service") RNS.log("Creating wake lock", RNS.LOG_DEBUG)
self.wake_lock = self.power_manager.newWakeLock(self.power_manager.PARTIAL_WAKE_LOCK, "sideband_service")
if not self.wake_lock.isHeld(): if self.wake_lock != None:
RNS.log("Taking wake lock", RNS.LOG_DEBUG) if not self.wake_lock.isHeld():
self.wake_lock.acquire() RNS.log("Taking wake lock", RNS.LOG_DEBUG)
else: self.wake_lock.acquire()
RNS.log("Wake lock already held", RNS.LOG_DEBUG) else:
RNS.log("Wake lock already held", RNS.LOG_DEBUG)
def release_locks(self): def release_locks(self):
if RNS.vendor.platformutils.get_platform() == "android": if RNS.vendor.platformutils.get_platform() == "android":