Delete CODE_OF_CONDUCT.md

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

diff --git a/tools/interfaces/IClipboard.py b/tools/interfaces/IClipboard.py
index 7d09d920c27c20a859dd64f7ba85524d70e3be51..c8538e7b4417458b29bb61e6e4776d7dd1ea0858 100644 (file)
--- a/tools/interfaces/IClipboard.py
+++ b/tools/interfaces/IClipboard.py
@@ -12,7 +12,10 @@ TRANSACTION_getClipboardData = 2
 
 def add_service(args, sendClipboardData, getClipboardData):
     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(
@@ -23,10 +26,12 @@ def add_service(args, sendClipboardData, getClipboardData):
             arg1 = reader.read_string16()
             sendClipboardData(arg1)
             local_response.append_int32(0)
-        if code == TRANSACTION_getClipboardData:
+        elif code == TRANSACTION_getClipboardData:
             ret = getClipboardData()
             local_response.append_int32(0)
             local_response.append_string16(ret)
+        else:
+            return local_response, -99999 # Some error unknown to binder to force a RemoteException
 
         return local_response, 0
 
@@ -35,7 +40,8 @@ def add_service(args, sendClipboardData, getClipboardData):
             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.clipboardLoop.quit()
 
     response = serviceManager.new_local_object(INTERFACE, response_handler)
@@ -44,5 +50,7 @@ def add_service(args, sendClipboardData, getClipboardData):
     status = serviceManager.add_presence_handler(binder_presence)
     if status:
         args.clipboardLoop.run()
+        serviceManager.remove_handler(status)
+        del serviceManager
     else:
         logging.error("Failed to add presence handler: {}".format(status))