Skip to content

Commit 700aa5c

Browse files
committed
Merge pull request #112036 from MBCX/report-supported-api-android
Change API 21 references to API 24
2 parents e07acf0 + 1e481b2 commit 700aa5c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

platform/android/export/export_plugin.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2345,7 +2345,7 @@ Error EditorExportPlatformAndroid::run(const Ref<EditorExportPreset> &p_preset,
23452345

23462346
const bool use_wifi_for_remote_debug = EDITOR_GET("export/android/use_wifi_for_remote_debug");
23472347
const bool use_remote = p_debug_flags.has_flag(DEBUG_FLAG_REMOTE_DEBUG) || p_debug_flags.has_flag(DEBUG_FLAG_DUMB_CLIENT);
2348-
const bool use_reverse = devices[p_device - 1].api_level >= 21 && !use_wifi_for_remote_debug;
2348+
const bool use_reverse = !use_wifi_for_remote_debug;
23492349

23502350
if (use_reverse) {
23512351
p_debug_flags.set_flag(DEBUG_FLAG_REMOTE_DEBUG_LOCALHOST);
@@ -2425,7 +2425,7 @@ Error EditorExportPlatformAndroid::run(const Ref<EditorExportPreset> &p_preset,
24252425

24262426
if (use_remote) {
24272427
if (use_reverse) {
2428-
static const char *const msg = "--- Device API >= 21; debugging over USB ---";
2428+
static const char *const msg = "--- Debugging over USB ---";
24292429
EditorNode::get_singleton()->get_log()->add_message(msg, EditorLog::MSG_TYPE_EDITOR);
24302430
print_line(String(msg).to_upper());
24312431

@@ -2469,7 +2469,7 @@ Error EditorExportPlatformAndroid::run(const Ref<EditorExportPreset> &p_preset,
24692469
print_line("Reverse result2: " + itos(rv));
24702470
}
24712471
} else {
2472-
static const char *const api_version_msg = "--- Device API < 21; debugging over Wi-Fi ---";
2472+
static const char *const api_version_msg = "--- Debugging over Wi-Fi ---";
24732473
static const char *const manual_override_msg = "--- Wi-Fi remote debug enabled in project settings; debugging over Wi-Fi ---";
24742474

24752475
const char *const msg = use_wifi_for_remote_debug ? manual_override_msg : api_version_msg;

0 commit comments

Comments
 (0)