Forráskód Böngészése

Merge pull request #97477 from m4gr3d/update_xr_editor_excluded_permissions

[XR Editor] Update the set of excluded permissions
Rémi Verschelde 11 hónapja
szülő
commit
58ec7a95a4

+ 2 - 2
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
 	}
 

+ 1 - 1
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)
 			}
 		}