Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
82141729
Commit
82141729
authored
Oct 11, 2019
by
Rémi Verschelde
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Android: Work around crash in _fix_manifest
Works around #32553, not fixing the underlying cause but preventing the crash.
parent
d655a7c0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
export.cpp
platform/android/export/export.cpp
+4
-2
No files found.
platform/android/export/export.cpp
View file @
82141729
...
@@ -828,14 +828,16 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
...
@@ -828,14 +828,16 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
encode_uint32
(
min_gles3
?
0x00030000
:
0x00020000
,
&
p_manifest
.
write
[
iofs
+
16
]);
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.
// Update the meta-data 'android:name' attribute based on the selected XR mode.
if
(
xr_mode_index
==
1
/* XRMode.OVR */
)
{
if
(
xr_mode_index
==
1
/* XRMode.OVR */
)
{
string_table
.
write
[
attr_value
]
=
"com.samsung.android.vr.application.mode"
;
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.
// Update the meta-data 'android:value' attribute based on the selected XR mode.
if
(
xr_mode_index
==
1
/* XRMode.OVR */
)
{
if
(
xr_mode_index
==
1
/* XRMode.OVR */
)
{
string_table
.
write
[
attr_value
]
=
"vr_only"
;
string_table
.
write
[
attr_value
]
=
"vr_only"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment