Merge pull request #50360 from m4gr3d/address_external_dir_access_master

Add support for Android scoped storage

1 files changed, 11 insertions, 7 deletions

diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp
index c2e12442b3..21fb31d991 100644
--- a/platform/android/os_android.cpp
+++ b/platform/android/os_android.cpp
@@ -213,6 +213,10 @@ String OS_Android::get_model_name() const {
 	return OS_Unix::get_model_name();
 }
 
+String OS_Android::get_data_path() const {
+	return get_user_data_dir();
+}
+
 String OS_Android::get_user_data_dir() const {
 	if (data_dir_cache != String())
 		return data_dir_cache;
@@ -225,11 +229,11 @@ String OS_Android::get_user_data_dir() const {
 	return ".";
 }
 
-String OS_Android::get_external_data_dir() const {
-	String data_dir = godot_io_java->get_external_data_dir();
-	if (data_dir != "") {
-		data_dir = _remove_symlink(data_dir);
-		return data_dir;
+String OS_Android::get_cache_path() const {
+	String cache_dir = godot_io_java->get_cache_dir();
+	if (cache_dir != "") {
+		cache_dir = _remove_symlink(cache_dir);
+		return cache_dir;
 	}
 	return ".";
 }
@@ -242,8 +246,8 @@ String OS_Android::get_unique_id() const {
 	return OS::get_unique_id();
 }
 
-String OS_Android::get_system_dir(SystemDir p_dir) const {
-	return godot_io_java->get_system_dir(p_dir);
+String OS_Android::get_system_dir(SystemDir p_dir, bool p_shared_storage) const {
+	return godot_io_java->get_system_dir(p_dir, p_shared_storage);
 }
 
 void OS_Android::set_display_size(const Size2i &p_size) {