tools: Upver to 1.3.4

[waydroid.git] / tools / actions / session_manager.py

diff --git a/tools/actions/session_manager.py b/tools/actions/session_manager.py
index 6b2f3ebd400f155e1b050335cc470561e48556b3..cc6a946adfae76bbc215b4cb8ede07a121757989 100644 (file)
--- a/tools/actions/session_manager.py
+++ b/tools/actions/session_manager.py
@@ -15,19 +15,11 @@ def start(args, unlocked_cb=None):
         stop(args)
         sys.exit(0)
 
-    xdg_session = os.getenv("XDG_SESSION_TYPE")
-    if xdg_session != "wayland":
-        logging.warning('XDG Session is not "wayland"')
-
     cfg = tools.config.load_session()
+    wayland_display = cfg["session"]["wayland_display"]
+    if wayland_display == "None" or not wayland_display:
+        logging.warning('WAYLAND_DISPLAY is not set, defaulting to "wayland-0"')
     waydroid_data = cfg["session"]["waydroid_data"]
-    #TODO: Drop me
-    old_user_waydroid = cfg["session"]["host_user"] + "/waydroid"
-    if os.path.isdir(old_user_waydroid):
-        if not os.path.isdir(waydroid_data):
-            shutil.move(old_user_waydroid, cfg["session"]["xdg_data_home"])
-        else:
-            os.removedirs(old_user_waydroid)
     if not os.path.isdir(waydroid_data):
         os.makedirs(waydroid_data)
     dpi = tools.helpers.props.host_get(args, "ro.sf.lcd_density")