projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Keep speaking even when screen is off
[fw/altos]
/
altosdroid
/
src
/
org
/
altusmetrum
/
AltosDroid
/
AltosDroid.java
diff --git
a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index b87b51b58fd98f9bcc3aab2385c0eab31de62cee..3a5026ee80cd80e03b84120af82cde25e998a3d4 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@
-133,7
+133,6
@@
public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
switch (msg.what) {
case MSG_STATE:
switch (msg.what) {
case MSG_STATE:
- AltosDebug.debug("MSG_STATE");
if (msg.obj == null) {
AltosDebug.debug("telemetry_state null!");
return;
if (msg.obj == null) {
AltosDebug.debug("telemetry_state null!");
return;
@@
-141,7
+140,6
@@
public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
ad.update_state((TelemetryState) msg.obj);
break;
case MSG_UPDATE_AGE:
ad.update_state((TelemetryState) msg.obj);
break;
case MSG_UPDATE_AGE:
- AltosDebug.debug("MSG_UPDATE_AGE");
ad.update_age();
break;
}
ad.update_age();
break;
}
@@
-691,12
+689,6
@@
public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
public void onStop() {
super.onStop();
AltosDebug.debug("-- ON STOP --");
public void onStop() {
super.onStop();
AltosDebug.debug("-- ON STOP --");
-
- doUnbindService();
- if (mAltosVoice != null) {
- mAltosVoice.stop();
- mAltosVoice = null;
- }
}
@Override
}
@Override
@@
-704,7
+696,11
@@
public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
super.onDestroy();
AltosDebug.debug("--- ON DESTROY ---");
super.onDestroy();
AltosDebug.debug("--- ON DESTROY ---");
- if (mAltosVoice != null) mAltosVoice.stop();
+ doUnbindService();
+ if (mAltosVoice != null) {
+ mAltosVoice.stop();
+ mAltosVoice = null;
+ }
stop_timer();
}
stop_timer();
}