X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/677710ab36bba687b04268704bd92b37638854d0..refs/heads/electrikjesus-patch-1:/tools/interfaces/IClipboard.py

diff --git a/tools/interfaces/IClipboard.py b/tools/interfaces/IClipboard.py
index a123501..c8538e7 100644
--- 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