android/sdremote/Makefile |
6 +++---
android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java |
3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 4a19c5bc3c679f83ac0d906e39dc1c51cbea97af
Author: Thorsten Behrens <tbehr...@suse.com>
Date: Sat Nov 24 17:40:38 2012 +0100
Avoid android deployment target to be the default one accidentally.
Change-Id: I5345850789cd85966aa92064d1a95b7793521e9a
diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile
index 0b5ef5f..8b06c98 100644
--- a/android/sdremote/Makefile
+++ b/android/sdremote/Makefile
@@ -8,9 +8,6 @@
include ../../config_host.mk
-install: all
- $(ANDROID_SDK_HOME)/platform-tools/adb install -r
./bin/ImpressRemote-debug.apk
-
all: properties
mkdir -p ../abs-lib/libs
cp $(ANDROID_SDK_HOME)/extras/android/support/v4/android-support-v4.jar
../abs-lib/libs
@@ -23,4 +20,7 @@ properties:
clean: properties
$(ANT) clean
+install: all
+ $(ANDROID_SDK_HOME)/platform-tools/adb install -r
./bin/ImpressRemote-debug.apk
+
# vim: set noet sw=4 ts=4:
commit 2739333e553a578bfdb4b20c7c6832297c87844d
Author: Thorsten Behrens <tbehr...@suse.com>
Date: Sat Nov 24 17:42:15 2012 +0100
Prevent bluetooth list update from crashing incessantly.
Temp fix, need to fix the race here.
Change-Id: I95ef1ce206ba0e9059b59c10cf7a76d39df1b8b7
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
index 21596c0..b5e75d4 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
@@ -260,6 +260,7 @@ public class SelectorActivity extends SherlockActivity {
Server[] aServers = mCommunicationService.getServers();
+/* TODO: this crashes currently - some concurrent modification on
mBluetoothServers
// Bluetooth -- Remove old
for (Entry<Server, View> aEntry : mBluetoothServers.entrySet()) {
if (!Arrays.asList(aServers).contains(aEntry.getKey())) {
@@ -268,6 +269,7 @@ public class SelectorActivity extends SherlockActivity {
.getParent());
}
}
+*/
// Network -- Remove old
for (Entry<Server, View> aEntry : mNetworkServers.entrySet()) {
if (!Arrays.asList(aServers).contains(aEntry.getKey())) {
@@ -381,4 +383,4 @@ public class SelectorActivity extends SherlockActivity {
return super.onContextItemSelected(item);
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
