1 files changed, 5 insertions, 19 deletions

diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp
index 78155fbef3..df2d32e152 100644
--- a/platform/android/export/export_plugin.cpp
+++ b/platform/android/export/export_plugin.cpp
@@ -416,10 +416,10 @@ String EditorExportPlatformAndroid::get_package_name(const String &p_package) co
 	bool first = true;
 	for (int i = 0; i < basename.length(); i++) {
 		char32_t c = basename[i];
-		if (c >= '0' && c <= '9' && first) {
+		if (is_digit(c) && first) {
 			continue;
 		}
-		if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9')) {
+		if (is_ascii_alphanumeric_char(c)) {
 			name += String::chr(c);
 			first = false;
 		}
@@ -462,19 +462,19 @@ bool EditorExportPlatformAndroid::is_package_name_valid(const String &p_package,
 			first = true;
 			continue;
 		}
-		if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_')) {
+		if (!is_ascii_identifier_char(c)) {
 			if (r_error) {
 				*r_error = vformat(TTR("The character '%s' is not allowed in Android application package names."), String::chr(c));
 			}
 			return false;
 		}
-		if (first && (c >= '0' && c <= '9')) {
+		if (first && is_digit(c)) {
 			if (r_error) {
 				*r_error = TTR("A digit cannot be the first character in a package segment.");
 			}
 			return false;
 		}
-		if (first && c == '_') {
+		if (first && is_underscore(c)) {
 			if (r_error) {
 				*r_error = vformat(TTR("The character '%s' cannot be the first character in a package segment."), String::chr(c));
 			}
@@ -975,20 +975,6 @@ void EditorExportPlatformAndroid::_fix_manifest(const Ref<EditorExportPreset> &p
 						}
 					}
 
-					if (tname == "meta-data" && attrname == "name" && value == "xr_mode_metadata_name") {
-						// Update the meta-data 'android:name' attribute based on the selected XR mode.
-						if (xr_mode_index == XR_MODE_OPENXR) {
-							string_table.write[attr_value] = "com.samsung.android.vr.application.mode";
-						}
-					}
-
-					if (tname == "meta-data" && attrname == "value" && value == "xr_mode_metadata_value") {
-						// Update the meta-data 'android:value' attribute based on the selected XR mode.
-						if (xr_mode_index == XR_MODE_OPENXR) {
-							string_table.write[attr_value] = "vr_only";
-						}
-					}
-
 					if (tname == "meta-data" && attrname == "name" && value == "xr_hand_tracking_metadata_name") {
 						if (xr_mode_index == XR_MODE_OPENXR && hand_tracking_index > XR_HAND_TRACKING_NONE) {
 							string_table.write[attr_value] = "com.oculus.handtracking.frequency";