]> glassweightruler.freedombox.rocks Git - waydroid.git/commitdiff
session: Provide waydroid.background_start bool
authorAlessandro Astone <ales.astone@gmail.com>
Wed, 25 Jan 2023 16:08:00 +0000 (17:08 +0100)
committerAlessandro Astone <ales.astone@gmail.com>
Wed, 25 Jan 2023 16:09:13 +0000 (17:09 +0100)
Can be used by hwcomposer for example to decide whether or not to
show the android bootanimation

tools/actions/app_manager.py
tools/actions/session_manager.py
tools/config/__init__.py
tools/helpers/images.py
tools/services/hardware_manager.py

index 53234ac94314d1aee444abd3632322371a13a4e8..ae9cb2550fe2a7cb0f9653b2d966c099954b8e5f 100644 (file)
@@ -69,7 +69,7 @@ def maybeLaunchLater(args, launchNow):
         launchNow()
     except dbus.DBusException:
         logging.error("Starting waydroid session")
-        tools.actions.session_manager.start(args, launchNow)
+        tools.actions.session_manager.start(args, launchNow, background=False)
 
 def launch(args):
     def justLaunch():
index 6709e14f1c174761c73b91c5a543ea2f99529635..d2daf7aeed6e8e14daf7c72c26d3db2280ec63d1 100644 (file)
@@ -30,7 +30,7 @@ def service(args, looper):
     dbus_obj = DbusSessionManager(looper, dbus.SessionBus(), '/SessionManager', args)
     looper.run()
 
-def start(args, unlocked_cb=None):
+def start(args, unlocked_cb=None, background=True):
     try:
         name = dbus.service.BusName("id.waydro.Session", dbus.SessionBus(), do_not_queue=True)
     except dbus.exceptions.NameExistsException:
@@ -72,6 +72,8 @@ def start(args, unlocked_cb=None):
             dpi = "0"
     session["lcd_density"] = dpi
 
+    session["background_start"] = "true" if background else "false"
+
     mainloop = GLib.MainLoop()
 
     def sigint_handler(data):
index 354f38404ac792552bbb2234a2eeafc1557cbb99..76a21623cd28a53f8edbb180879cee1f988f78a9 100644 (file)
@@ -60,7 +60,8 @@ session_defaults = {
     "wayland_display": str(os.environ.get('WAYLAND_DISPLAY')),
     "pulse_runtime_path": str(os.environ.get('PULSE_RUNTIME_PATH')),
     "state": "STOPPED",
-    "lcd_density": "0"
+    "lcd_density": "0",
+    "background_start": "true"
 }
 session_defaults["config_path"] = defaults["work"] + "/session.cfg"
 session_defaults["waydroid_data"] = session_defaults["xdg_data_home"] + \
index 3f1929c68af7445491650fa86f2eade9934d958a..740dbc5ed45373235c23dc5306ac5f094d66f17e 100644 (file)
@@ -122,6 +122,7 @@ def make_prop(args, cfg, full_props_path):
     add_prop("waydroid.xdg_runtime_dir", "xdg_runtime_dir")
     add_prop("waydroid.pulse_runtime_path", "pulse_runtime_path")
     add_prop("waydroid.wayland_display", "wayland_display")
+    add_prop("waydroid.background_start", "background_start")
     if which("waydroid-sensord") is None:
         props.append("waydroid.stub_sensors_hal=1")
     dpi = cfg["lcd_density"]
index efc3236c7b4aa954e8d54386872acd32c89b971d..76104cbfdf1f8c02773e638e38788914eaad7f1f 100644 (file)
@@ -33,6 +33,7 @@ def start(args):
         helpers.images.umount_rootfs(args)
         helpers.images.replace(args, system_zip, system_time,
                                vendor_zip, vendor_time)
+        args.session["background_start"] = "false"
         helpers.images.mount_rootfs(args, args.images_path, args.session)
         helpers.protocol.set_aidl_version(args)
         helpers.lxc.start(args)