Add sysconfdir to Makefile defaulting to /etc

[waydroid.git] / tools / services / user_manager.py

diff --git a/tools/services/user_manager.py b/tools/services/user_manager.py
index 3b5ea29e0d568435bd4d0b4c1448a4522a42025f..92ee203b688eac7f5dc20b6a1aac5fc5e01f642f 100644 (file)
--- a/tools/services/user_manager.py
+++ b/tools/services/user_manager.py
@@ -43,6 +43,7 @@ Actions=app_settings;
 [Desktop Action app_settings]
 Name=App Settings
 Exec=waydroid app intent android.settings.APPLICATION_DETAILS_SETTINGS package:{packageName}
+Icon={waydroid_data}/icons/com.android.settings.png
 """)
             return 0
 
@@ -63,9 +64,11 @@ NoDisplay={str(hide).lower()}
 """)
 
     def userUnlocked(uid):
+        cfg = tools.config.load(args)
         logging.info("Android with user {} is ready".format(uid))
 
-        tools.helpers.net.adb_connect(args)
+        if cfg["waydroid"]["auto_adb"] == "True":
+            tools.helpers.net.adb_connect(args)
 
         platformService = IPlatform.get_service(args)
         if platformService: