diff options
| author | Eugene Sandulenko | 2019-09-25 21:47:30 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-09-27 00:22:20 +0200 |
| commit | 580142c9eaf7fafd4f15827545aaa7f4a1d03322 (patch) | |
| tree | d5d6fa5625409f3ec19dec07f45a7f411c17976e /backends/platform/android/org | |
| parent | 2b72cc0b5ce716a8163ef211887df5c9742983a5 (diff) | |
| download | scummvm-rg350-580142c9eaf7fafd4f15827545aaa7f4a1d03322.tar.gz scummvm-rg350-580142c9eaf7fafd4f15827545aaa7f4a1d03322.tar.bz2 scummvm-rg350-580142c9eaf7fafd4f15827545aaa7f4a1d03322.zip | |
ANDROID: Hook getAllStorageLocations() into JNI
Diffstat (limited to 'backends/platform/android/org')
3 files changed, 4 insertions, 4 deletions
diff --git a/backends/platform/android/org/scummvm/scummvm/ExternalStorage.java b/backends/platform/android/org/scummvm/scummvm/ExternalStorage.java index 234fba9bff..d8bab31517 100644 --- a/backends/platform/android/org/scummvm/scummvm/ExternalStorage.java +++ b/backends/platform/android/org/scummvm/scummvm/ExternalStorage.java @@ -104,7 +104,7 @@ public class ExternalStorage { List<String> mountHash = new ArrayList<String>(10); - for (String mount : mMounts){ + for (String mount : mMounts) { File root = new File(mount); if (root.exists() && root.isDirectory() && root.canRead()) { File[] list = root.listFiles(); diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVM.java b/backends/platform/android/org/scummvm/scummvm/ScummVM.java index ea7bf5242d..34349d4606 100644 --- a/backends/platform/android/org/scummvm/scummvm/ScummVM.java +++ b/backends/platform/android/org/scummvm/scummvm/ScummVM.java @@ -63,7 +63,7 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable { abstract protected void showVirtualKeyboard(boolean enable); abstract protected void showKeyboardControl(boolean enable); abstract protected String[] getSysArchives(); - abstract protected List<String> getAllStorageLocations(); + abstract protected String[] getAllStorageLocations(); public ScummVM(AssetManager asset_manager, SurfaceHolder holder) { _asset_manager = asset_manager; diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java index a955f02327..6978f6e3b0 100644 --- a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java +++ b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java @@ -157,8 +157,8 @@ public class ScummVMActivity extends Activity { } @Override - protected List<String> getAllStorageLocations() { - return _externalStorage.getAllStorageLocations(); + protected String[] getAllStorageLocations() { + return _externalStorage.getAllStorageLocations().toArray(new String[0]); } } |