merge heads

MyTracks/src/com/google/android/apps/mytracks/MapActivity.java

@@ -365,7 +365,7 @@ public class MapActivity extends com.google.android.maps.MapActivity
             String saveFileFormat = getString(R.string.track_list_save_file);
             String shareFileFormat = getString(R.string.track_list_share_file);
             String fileTypes[] = getResources().getStringArray(R.array.file_types);
-            
+
             menu.add(0, Constants.MENU_SEND_TO_GOOGLE, 0,
                 R.string.track_list_send_google);
             SubMenu share = menu.addSubMenu(0, Constants.MENU_SHARE, 0,
@@ -469,6 +469,9 @@ public class MapActivity extends com.google.android.maps.MapActivity
         if (mapView.getZoomLevel() < 18) {
           mapView.getController().setZoom(18);
         }
+        if (currentLocation != null) {
+          showCurrentLocation();
+        }
         return true;
       }
       case Constants.MENU_TOGGLE_LAYERS: {

MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntMessage.java

@@ -25,8 +25,8 @@ public class AntMessage {
 
   /** Build a short value from its constituent bytes */
   protected static short decodeShort(byte b0, byte b1) {
-    short value = b0;
-    value |= ((short) b1) << 8;
-    return value;
+    int value = b0 & 0xFF;
+    value |= (b1 & 0xFF) << 8;
+    return (short)value;
   }
 }

MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensorManager.java

@@ -92,7 +92,7 @@ public abstract class AntSensorManager extends SensorManager {
       String antAction = intent.getAction();
       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);
         if (DEBUGGING) {
           Log.d(TAG, "Received RX message " + messageToString(antMessage));
@@ -185,22 +185,24 @@ public abstract class AntSensorManager extends SensorManager {
    * Cleans up the ANT+ receiver interface, by releasing the interface
    * and destroying it.
    */
-  private void cleanAntInterface()
-  {
+  private void cleanAntInterface() {
     Log.i(TAG, "Destroying AntSensorManager");
+
+    if (antReceiver == null) {
+      Log.e(TAG, "no ANT receiver");
+      return;
+    }
     
-    if (antReceiver != null) {
-      try {
-        antReceiver.releaseInterface();
-      } catch (AntServiceNotConnectedException e) {
-        Log.i(TAG, "ANT service not connected", e);
-      } catch (AntInterfaceException e) {
-        Log.e(TAG, "failed to release ANT interface", e);
-      }
-  
+    try {
+      antReceiver.releaseInterface();
       antReceiver.destroy();
-      
       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);
     }
   }
   
@@ -212,6 +214,11 @@ public abstract class AntSensorManager extends SensorManager {
   private synchronized void serviceConnected() {
     Log.d(TAG, "ANT service connected");
 
+    if (antReceiver == null) {
+      Log.e(TAG, "no ANT receiver");
+      return;
+    }
+    
     try {
       if (!antReceiver.claimInterface()) {
         Log.e(TAG, "failed to claim ANT interface");
@@ -299,6 +306,11 @@ public abstract class AntSensorManager extends SensorManager {
       short deviceNumber, byte deviceType, byte txType, short channelPeriod,
       byte radioFreq, byte proxSearch) {
 
+    if (antReceiver == null) {
+      Log.e(TAG, "no ANT receiver");
+      return false;        
+    }
+    
     try {
       // Assign as slave channel on selected network (0 = public, 1 = ANT+, 2 =
       // ANTFS)