[Scummvm-git-logs] scummvm master -> ae061f0341aa7001ccbeae8498dbe362c1a73833

[lephilousophe]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
43a4e09d6f ANDROID: Fix shaders loading
ae061f0341 ANDROID: Remove useless variable


Commit: 43a4e09d6f30330029dbd6171d095d709464c99d
    https://github.com/scummvm/scummvm/commit/43a4e09d6f30330029dbd6171d095d709464c99d
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-11-14T22:20:34+01:00

Commit Message:
ANDROID: Fix shaders loading

When loaded from internal storage, the assets must go deeper than before
as we now extract folders.

Changed paths:
    backends/platform/android/jni-android.cpp


diff --git a/backends/platform/android/jni-android.cpp b/backends/platform/android/jni-android.cpp
index f2f43971064..874f6771b5a 100644
--- a/backends/platform/android/jni-android.cpp
+++ b/backends/platform/android/jni-android.cpp
@@ -600,7 +600,7 @@ void JNI::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
 		const char *path = env->GetStringUTFChars(path_obj, 0);
 
 		if (path != 0) {
-			s.addDirectory(path, path, priority);
+			s.addDirectory(path, path, priority, 2);
 			env->ReleaseStringUTFChars(path_obj, path);
 		}
 


Commit: ae061f0341aa7001ccbeae8498dbe362c1a73833
    https://github.com/scummvm/scummvm/commit/ae061f0341aa7001ccbeae8498dbe362c1a73833
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-11-14T22:20:34+01:00

Commit Message:
ANDROID: Remove useless variable

Changed paths:
    backends/platform/android/org/scummvm/scummvm/SAFFSTree.java


diff --git a/backends/platform/android/org/scummvm/scummvm/SAFFSTree.java b/backends/platform/android/org/scummvm/scummvm/SAFFSTree.java
index 942abf52e54..01c657b82e1 100644
--- a/backends/platform/android/org/scummvm/scummvm/SAFFSTree.java
+++ b/backends/platform/android/org/scummvm/scummvm/SAFFSTree.java
@@ -277,7 +277,6 @@ public class SAFFSTree {
 	}
 
 	public SAFFSNode getChild(SAFFSNode node, String name) {
-		final ContentResolver resolver = _context.getContentResolver();
 		final Uri searchUri = DocumentsContract.buildChildDocumentsUriUsingTree(_treeUri, node._documentId);
 
 		SAFFSNode newnode;