diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-10-11 09:38:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-11 09:38:48 +0200 |
| commit | 197be41cca6f24798e542398437f5dc35923c2f1 (patch) | |
| tree | fcf92adf0c9b1e4719fac8238d4755ac9da0ba27 | |
| parent | d655a7c09737afdc03d787f861573dd167c9db85 (diff) | |
| parent | 82141729d278bb63a2bcccba041b36405f8490d1 (diff) | |
Merge pull request #32740 from akien-mga/android-workaround-crash-fix-manifest
Android: Work around crash in _fix_manifest
| -rw-r--r-- | platform/android/export/export.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index b61575e2aa..ab5cba04a2 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -828,14 +828,16 @@ class EditorExportPlatformAndroid : public EditorExportPlatform { encode_uint32(min_gles3 ? 0x00030000 : 0x00020000, &p_manifest.write[iofs + 16]); } - if (tname == "meta-data" && attrname == "name" && string_table[attr_value] == "xr_mode_metadata_name") { + // FIXME: `attr_value != 0xFFFFFFFF` below added as a stopgap measure for GH-32553, + // but the issue should be debugged further and properly addressed. + if (tname == "meta-data" && attrname == "name" && attr_value != 0xFFFFFFFF && string_table[attr_value] == "xr_mode_metadata_name") { // Update the meta-data 'android:name' attribute based on the selected XR mode. if (xr_mode_index == 1 /* XRMode.OVR */) { string_table.write[attr_value] = "com.samsung.android.vr.application.mode"; } } - if (tname == "meta-data" && attrname == "value" && string_table[attr_value] == "xr_mode_metadata_value") { + if (tname == "meta-data" && attrname == "value" && attr_value != 0xFFFFFFFF && string_table[attr_value] == "xr_mode_metadata_value") { // Update the meta-data 'android:value' attribute based on the selected XR mode. if (xr_mode_index == 1 /* XRMode.OVR */) { string_table.write[attr_value] = "vr_only"; |