From bb76e721e920d35922db7a3b0b8b002236cf53c1 Mon Sep 17 00:00:00 2001 From: RedMser Date: Mon, 30 Dec 2024 17:37:24 +0100 Subject: [PATCH] Respect system user setting for (un)installing APK --- platform/android/export/export_plugin.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index bae886704d1..30376b5c55d 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -2177,6 +2177,10 @@ Error EditorExportPlatformAndroid::run(const Ref &p_preset, args.push_back("-s"); args.push_back(devices[p_device].id); args.push_back("uninstall"); + if ((bool)EDITOR_GET("export/android/force_system_user") && devices[p_device].api_level >= 17) { + args.push_back("--user"); + args.push_back("0"); + } args.push_back(get_package_name(package_name)); output.clear(); @@ -2193,6 +2197,10 @@ Error EditorExportPlatformAndroid::run(const Ref &p_preset, args.push_back("-s"); args.push_back(devices[p_device].id); args.push_back("install"); + if ((bool)EDITOR_GET("export/android/force_system_user") && devices[p_device].api_level >= 17) { + args.push_back("--user"); + args.push_back("0"); + } args.push_back("-r"); args.push_back(tmp_export_path); @@ -2268,7 +2276,7 @@ Error EditorExportPlatformAndroid::run(const Ref &p_preset, args.push_back("shell"); args.push_back("am"); args.push_back("start"); - if ((bool)EDITOR_GET("export/android/force_system_user") && devices[p_device].api_level >= 17) { // Multi-user introduced in Android 17 + if ((bool)EDITOR_GET("export/android/force_system_user") && devices[p_device].api_level >= 17) { args.push_back("--user"); args.push_back("0"); }