karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

merge heads

Browse Source
This commit is contained in:
Jimmy Shih
2011-11-15 17:32:29 -08:00
parent ae28dc01fe 3731037e68
commit f5eebb1b87
1 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensorManager.java
+23 -12
View File
@@ -92,7 +92,7 @@ public abstract class AntSensorManager extends SensorManager {
String antAction = intent.getAction(); String antAction = intent.getAction();
Log.i(TAG, "enter data onReceive" + antAction); Log.i(TAG, "enter data onReceive" + antAction);
if (antAction.equals(AntInterfaceIntent.ANT_RX_MESSAGE_ACTION)) { if (antAction != null && antAction.equals(AntInterfaceIntent.ANT_RX_MESSAGE_ACTION)) {
byte[] antMessage = intent.getByteArrayExtra(AntInterfaceIntent.ANT_MESSAGE); byte[] antMessage = intent.getByteArrayExtra(AntInterfaceIntent.ANT_MESSAGE);
if (DEBUGGING) { if (DEBUGGING) {
Log.d(TAG, "Received RX message " + messageToString(antMessage)); Log.d(TAG, "Received RX message " + messageToString(antMessage));
@@ -185,22 +185,23 @@ public abstract class AntSensorManager extends SensorManager {
* Cleans up the ANT+ receiver interface, by releasing the interface * Cleans up the ANT+ receiver interface, by releasing the interface
* and destroying it. * and destroying it.
*/ */
private void cleanAntInterface() private void cleanAntInterface() {
{
Log.i(TAG, "Destroying AntSensorManager"); Log.i(TAG, "Destroying AntSensorManager");
if (antReceiver != null) { try {
try { if (antReceiver == null) {
antReceiver.releaseInterface(); Log.e(TAG, "no ANT receiver");
} catch (AntServiceNotConnectedException e) { return;
Log.i(TAG, "ANT service not connected", e);
} catch (AntInterfaceException e) {
Log.e(TAG, "failed to release ANT interface", e);
} }
antReceiver.releaseInterface();
antReceiver.destroy(); antReceiver.destroy();
antReceiver = null; antReceiver = null;
} catch (AntServiceNotConnectedException e) {
Log.i(TAG, "ANT service not connected", e);
} catch (AntInterfaceException e) {
Log.e(TAG, "failed to release ANT interface", e);
} catch (RuntimeException e) {
Log.e(TAG, "run-time exception when cleaning the ANT interface", e);
} }
} }
@@ -213,6 +214,11 @@ public abstract class AntSensorManager extends SensorManager {
Log.d(TAG, "ANT service connected"); Log.d(TAG, "ANT service connected");
try { try {
if (antReceiver == null) {
Log.e(TAG, "no ANT receiver");
return;
}
if (!antReceiver.claimInterface()) { if (!antReceiver.claimInterface()) {
Log.e(TAG, "failed to claim ANT interface"); Log.e(TAG, "failed to claim ANT interface");
return; return;
@@ -300,6 +306,11 @@ public abstract class AntSensorManager extends SensorManager {
byte radioFreq, byte proxSearch) { byte radioFreq, byte proxSearch) {
try { try {
if (antReceiver == null) {
Log.e(TAG, "no ANT receiver");
return false;
}
// Assign as slave channel on selected network (0 = public, 1 = ANT+, 2 = // Assign as slave channel on selected network (0 = public, 1 = ANT+, 2 =
// ANTFS) // ANTFS)
antReceiver.ANTAssignChannel(channelNumber, AntDefine.PARAMETER_RX_NOT_TX, networkNumber); antReceiver.ANTAssignChannel(channelNumber, AntDefine.PARAMETER_RX_NOT_TX, networkNumber);