Improve robustness of the dynamic aidl version picker

[waydroid.git] / tools / interfaces / IUserMonitor.py

diff --git a/tools/interfaces/IUserMonitor.py b/tools/interfaces/IUserMonitor.py
index 665277801c711fd8e9459cd885a5f90d2a581a57..664fac648cfe9408b7c1dbd76791d6441cb8d181 100644 (file)
--- a/tools/interfaces/IUserMonitor.py
+++ b/tools/interfaces/IUserMonitor.py
@@ -12,7 +12,10 @@ TRANSACTION_packageStateChanged = 2
 
 def add_service(args, userUnlocked, packageStateChanged):
     helpers.drivers.loadBinderNodes(args)
-    serviceManager = gbinder.ServiceManager("/dev/" + args.BINDER_DRIVER)
+    try:
+        serviceManager = gbinder.ServiceManager("/dev/" + args.BINDER_DRIVER, args.SERVICE_MANAGER_PROTOCOL, args.BINDER_PROTOCOL)
+    except TypeError:
+        serviceManager = gbinder.ServiceManager("/dev/" + args.BINDER_DRIVER)
 
     def response_handler(req, code, flags):
         logging.debug(
@@ -37,7 +40,8 @@ def add_service(args, userUnlocked, packageStateChanged):
             status = serviceManager.add_service_sync(SERVICE_NAME, response)
 
             if status:
-                logging.error("Failed to add service " + SERVICE_NAME)
+                logging.error("Failed to add service {}: {}".format(
+                    SERVICE_NAME, status))
                 args.userMonitorLoop.quit()
 
     response = serviceManager.new_local_object(INTERFACE, response_handler)
@@ -46,6 +50,8 @@ def add_service(args, userUnlocked, packageStateChanged):
     status = serviceManager.add_presence_handler(binder_presence)
     if status:
         args.userMonitorLoop.run()
+        serviceManager.remove_handler(status)
+        del serviceManager
     else:
         logging.error("Failed to add presence handler: {}".format(status))