X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/1f0393876d891d0e32a995d0bf7259cc6505afdc..ec85ccf53cd5c3c9a38d0ffecbf85986963007c1:/tools/interfaces/IHardware.py

diff --git a/tools/interfaces/IHardware.py b/tools/interfaces/IHardware.py
index 347a89c..69539f1 100644
--- a/tools/interfaces/IHardware.py
+++ b/tools/interfaces/IHardware.py
@@ -12,10 +12,14 @@ TRANSACTION_enableBluetooth = 2
 TRANSACTION_suspend = 3
 TRANSACTION_reboot = 4
 TRANSACTION_upgrade = 5
+TRANSACTION_upgrade2 = 6
 
 def add_service(args, enableNFC, enableBluetooth, suspend, reboot, upgrade):
     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(
@@ -27,24 +31,33 @@ def add_service(args, enableNFC, enableBluetooth, suspend, reboot, upgrade):
             ret = enableNFC(arg1 != 0)
             local_response.append_int32(0)
             local_response.append_int32(ret)
-        if code == TRANSACTION_enableBluetooth:
+        elif code == TRANSACTION_enableBluetooth:
             status, arg1 = reader.read_int32()
             ret = enableBluetooth(arg1 != 0)
             local_response.append_int32(0)
             local_response.append_int32(ret)
-        if code == TRANSACTION_suspend:
+        elif code == TRANSACTION_suspend:
             suspend()
             local_response.append_int32(0)
-        if code == TRANSACTION_reboot:
+        elif code == TRANSACTION_reboot:
             reboot()
             local_response.append_int32(0)
-        if code == TRANSACTION_upgrade:
+        elif code == TRANSACTION_upgrade:
             arg1 = reader.read_string16()
             status, arg2 = reader.read_int32()
             arg3 = reader.read_string16()
             status, arg4 = reader.read_int32()
             upgrade(arg1, arg2, arg3, arg4)
             local_response.append_int32(0)
+        elif code == TRANSACTION_upgrade2:
+            arg1 = reader.read_string16()
+            status, arg2 = reader.read_int64()
+            arg3 = reader.read_string16()
+            status, arg4 = reader.read_int64()
+            upgrade(arg1, arg2, arg3, arg4)
+            local_response.append_int32(0)
+        else:
+            return local_response, -99999 # Some error unknown to binder to force a RemoteException
 
         return local_response, 0
 
@@ -53,7 +66,8 @@ def add_service(args, enableNFC, enableBluetooth, suspend, reboot, upgrade):
             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.hardwareLoop.quit()
 
     response = serviceManager.new_local_object(INTERFACE, response_handler)
@@ -62,5 +76,7 @@ def add_service(args, enableNFC, enableBluetooth, suspend, reboot, upgrade):
     status = serviceManager.add_presence_handler(binder_presence)
     if status:
         args.hardwareLoop.run()
+        serviceManager.remove_handler(status)
+        del serviceManager
     else:
         logging.error("Failed to add presence handler: {}".format(status))