diff options
| author | Fredia Huya-Kouadio <fhuya@meta.com> | 2024-09-25 23:21:16 -0700 |
|---|---|---|
| committer | Fredia Huya-Kouadio <fhuya@meta.com> | 2024-09-25 23:22:16 -0700 |
| commit | 77202e08b4794dd28ff626ac3a33348e4d13b13a (patch) | |
| tree | faa0d27433eeb03c60c942a4b6a7427716413d4b /platform/android/java | |
| parent | f7c567e2f56d6e63f4749387a67e5ea4903c4696 (diff) | |
| download | redot-engine-77202e08b4794dd28ff626ac3a33348e4d13b13a.tar.gz | |
Update the set of excluded permissions for the XR Editor
A few permissions including the `USE_SCENE` permission are being renamed with the launch of the Meta Spatial SDK, so we update the excluded list to avoid requesting them on app start.
Diffstat (limited to 'platform/android/java')
| -rw-r--r-- | platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotEditor.kt | 4 | ||||
| -rw-r--r-- | platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotXRGame.kt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotEditor.kt b/platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotEditor.kt index 6cb08ae94b..9dc34f2267 100644 --- a/platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotEditor.kt +++ b/platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotEditor.kt @@ -45,14 +45,14 @@ open class GodotEditor : BaseGodotEditor() { internal val XR_RUN_GAME_INFO = EditorWindowInfo(GodotXRGame::class.java, 1667, ":GodotXRGame") - internal const val USE_SCENE_PERMISSION = "com.oculus.permission.USE_SCENE" + internal val USE_SCENE_PERMISSIONS = listOf("com.oculus.permission.USE_SCENE", "horizonos.permission.USE_SCENE") } override fun getExcludedPermissions(): MutableSet<String> { val excludedPermissions = super.getExcludedPermissions() // The USE_SCENE permission is requested when the "xr/openxr/enabled" project setting // is enabled. - excludedPermissions.add(USE_SCENE_PERMISSION) + excludedPermissions.addAll(USE_SCENE_PERMISSIONS) return excludedPermissions } diff --git a/platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotXRGame.kt b/platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotXRGame.kt index 5db2879aad..0c82791e89 100644 --- a/platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotXRGame.kt +++ b/platform/android/java/editor/src/horizonos/java/org/godotengine/editor/GodotXRGame.kt @@ -69,7 +69,7 @@ open class GodotXRGame: GodotGame() { val automaticPermissionsRequestEnabled = automaticallyRequestPermissionsSetting.isNullOrEmpty() || automaticallyRequestPermissionsSetting.toBoolean() if (automaticPermissionsRequestEnabled) { - permissionsToEnable.add(USE_SCENE_PERMISSION) + permissionsToEnable.addAll(USE_SCENE_PERMISSIONS) } } |