X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=30a949d57378cf8607c7a7a2e5a230e9c2dfb7c3;hp=026e836df1e4f8c10038f0bb1879ad84b5089643;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hpb=3c7b68b8a513b611500dfd734182e1a2e7bdd40c

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 026e836d..30a949d5 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -51,7 +52,7 @@ import android.hardware.usb.*;
 import android.graphics.*;
 import android.graphics.drawable.*;
 
-import org.altusmetrum.altoslib_10.*;
+import org.altusmetrum.altoslib_11.*;
 
 public class AltosDroid extends FragmentActivity implements AltosUnitsListener, LocationListener {
 
@@ -825,9 +826,9 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 		}
 	}
 
-	private void disconnectDevice() {
+	private void disconnectDevice(boolean remember) {
 		try {
-			mService.send(Message.obtain(null, TelemetryService.MSG_DISCONNECT, null));
+			mService.send(Message.obtain(null, TelemetryService.MSG_DISCONNECT, (Boolean) remember));
 		} catch (RemoteException e) {
 		}
 	}
@@ -978,11 +979,11 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 		case R.id.disconnect:
 			/* Disconnect the device
 			 */
-			disconnectDevice();
+			disconnectDevice(false);
 			return true;
 		case R.id.quit:
 			AltosDebug.debug("R.id.quit");
-			disconnectDevice();
+			disconnectDevice(true);
 			finish();
 			return true;
 		case R.id.setup: