summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredia Huya-Kouadio <fhuya@meta.com>2023-03-20 08:56:04 -0700
committerYuri Sizov <yuris@humnom.net>2023-03-27 17:38:00 +0200
commit9ac978190e25a5ec44d4f66a4883d3ef707e46f0 (patch)
treea00aad6e03f507c6e5fa0b51da5274dbf70092a0
parent94e90b05934628b29678f246c23101fff17cac86 (diff)
Fix directory access when the running app has the `All files access` permission
(cherry picked from commit f02e4e4091ccabe05e3eb114b888c2ede86ab189)
-rw-r--r--platform/android/java/lib/src/org/godotengine/godot/io/StorageScope.kt9
1 files changed, 8 insertions, 1 deletions
diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/StorageScope.kt b/platform/android/java/lib/src/org/godotengine/godot/io/StorageScope.kt
index 833ab40af0..8ee3d5f48f 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/io/StorageScope.kt
+++ b/platform/android/java/lib/src/org/godotengine/godot/io/StorageScope.kt
@@ -76,6 +76,13 @@ internal enum class StorageScope {
return UNKNOWN
}
+ // If we have 'All Files Access' permission, we can access all directories without
+ // restriction.
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
+ && Environment.isExternalStorageManager()) {
+ return APP
+ }
+
val canonicalPathFile = pathFile.canonicalPath
if (internalAppDir != null && canonicalPathFile.startsWith(internalAppDir)) {
@@ -90,7 +97,7 @@ internal enum class StorageScope {
return APP
}
- var rootDir: String? = System.getenv("ANDROID_ROOT")
+ val rootDir: String? = System.getenv("ANDROID_ROOT")
if (rootDir != null && canonicalPathFile.startsWith(rootDir)) {
return APP
}