android/source/src/java/org/libreoffice/storage/external/ExtsdDocumentsProvider.java | 3 +++ configure.ac | 4 ++-- solenv/bin/native-code.py | 1 + 3 files changed, 6 insertions(+), 2 deletions(-)
New commits: commit 6cac8409642e3b53dd21ccb833a0d0b85e005f85 Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Date: Sat Jul 2 17:23:21 2016 +0200 android: another constructor function that fell victim to tdf#74608 Change-Id: Ie7619ec157c1ce825ad82b2de8b5e7742fd5c96e diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index c7041fe..738537f 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -105,6 +105,7 @@ core_constructor_list = [ "com_sun_star_comp_task_OfficeRestartManager", "IndexedPropertyValuesContainer_get_implementation", "NamedPropertyValuesContainer_get_implementation", + "com_sun_star_comp_comphelper_OPropertyBag", "com_sun_star_comp_SequenceInputStreamService", "com_sun_star_comp_SequenceOutputStreamService", # dbaccess/util/dba.component commit 66be4feef7e0d3661f01fbb2372700de5eeea070 Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Date: Sat Jul 2 17:20:52 2016 +0200 android: prevent crash if storage is unavailable Change-Id: I350acc1735d5fd22a27434fc5ccf2ab39bf3d2cf diff --git a/android/source/src/java/org/libreoffice/storage/external/ExtsdDocumentsProvider.java b/android/source/src/java/org/libreoffice/storage/external/ExtsdDocumentsProvider.java index 49b441e..abbfca9 100644 --- a/android/source/src/java/org/libreoffice/storage/external/ExtsdDocumentsProvider.java +++ b/android/source/src/java/org/libreoffice/storage/external/ExtsdDocumentsProvider.java @@ -59,6 +59,9 @@ public class ExtsdDocumentsProvider implements IExternalDocumentProvider, String internalSDPath = internalSD.getAbsolutePath(); for (File option: options) { + // Returned paths may be null if a storage device is unavailable. + if (null == option) { continue; } + String optionPath = option.getAbsolutePath(); if(optionPath.contains(internalSDPath)) commit 3b219e5487ae274722f0c4cef7f24f9246bf6abd Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Date: Sat Jul 2 17:17:53 2016 +0200 allow android ndk version 12.1.x Change-Id: Id1bbc683afda021c0801327bceee10cb4f28e9f6 diff --git a/configure.ac b/configure.ac index 39bc17f..80ae2ac0 100644 --- a/configure.ac +++ b/configure.ac @@ -360,10 +360,10 @@ if test -n "$with_android_ndk"; then case $ANDROID_NDK_VERSION in r9*|r10*) ;; - 11.1.*) + 11.1.*|12.1.*) ;; *) - AC_MSG_ERROR([Unsupported NDK version $ANDROID_NDK_VERSION, only r9*, r10* and 11.1.* versions are supported]) + AC_MSG_ERROR([Unsupported NDK version $ANDROID_NDK_VERSION, only r9*, r10*, 11.1.* and 12.1.* are supported]) ;; esac _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits