Improve robustness of the dynamic aidl version picker

[waydroid.git] / tools / helpers / drivers.py

diff --git a/tools/helpers/drivers.py b/tools/helpers/drivers.py
index 66744b3bc33d833cc4102eea1bfbcdcc139c26e6..b04877d6577e1ab489f3609653f6aaeb77e2af4f 100644 (file)
--- a/tools/helpers/drivers.py
+++ b/tools/helpers/drivers.py
@@ -176,5 +176,6 @@ def loadBinderNodes(args):
     args.BINDER_DRIVER = cfg["waydroid"]["binder"]
     args.VNDBINDER_DRIVER = cfg["waydroid"]["vndbinder"]
     args.HWBINDER_DRIVER = cfg["waydroid"]["hwbinder"]
-    args.BINDER_PROTOCOL = cfg["waydroid"]["binder_protocol"]
-    args.SERVICE_MANAGER_PROTOCOL = cfg["waydroid"]["service_manager_protocol"]
+    # These might not be in cfg on package upgrade
+    args.BINDER_PROTOCOL = cfg["waydroid"].get("binder_protocol")
+    args.SERVICE_MANAGER_PROTOCOL = cfg["waydroid"].get("service_manager_protocol")