X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/5eb95c31a8eb6c13d27dcceb5510f2d9c6a04d71..1d5b044276c6ba2d3b2522ff3bf870a8e91cd8e6:/tools/interfaces/IStatusBarService.py

diff --git a/tools/interfaces/IStatusBarService.py b/tools/interfaces/IStatusBarService.py
index fa5f6f5..d4dad60 100644
--- a/tools/interfaces/IStatusBarService.py
+++ b/tools/interfaces/IStatusBarService.py
@@ -2,6 +2,8 @@ import gbinder
 import logging
 import time
 from tools import helpers
+from gi.repository import GLib
+import signal
 
 
 INTERFACE = "com.android.internal.statusbar.IStatusBarService"
@@ -46,6 +48,13 @@ def get_service(args):
         serviceManager = gbinder.ServiceManager("/dev/" + args.BINDER_DRIVER, args.SERVICE_MANAGER_PROTOCOL, args.BINDER_PROTOCOL)
     except TypeError:
         serviceManager = gbinder.ServiceManager("/dev/" + args.BINDER_DRIVER)
+
+    if not serviceManager.is_present():
+        logging.info("Waiting for binder Service Manager...")
+        if not wait_for_manager(serviceManager):
+            logging.error("Service Manager never appeared")
+            return None
+
     tries = 1000
 
     remote, status = serviceManager.get_service_sync(SERVICE_NAME)
@@ -60,3 +69,15 @@ def get_service(args):
             return None
 
     return IStatusBarService(remote)
+
+# Like ServiceManager.wait() but can be interrupted
+def wait_for_manager(sm):
+    mainloop = GLib.MainLoop()
+    hndl = sm.add_presence_handler(lambda: mainloop.quit() if sm.is_present() else None)
+    GLib.timeout_add_seconds(60, lambda: mainloop.quit())
+    GLib.unix_signal_add(GLib.PRIORITY_HIGH, signal.SIGINT, lambda _: mainloop.quit(), None)
+    mainloop.run()
+    sm.remove_handler(hndl)
+    if not sm.is_present():
+        return False
+    return True