From 0691875f061ede9c5ddf8c32d5fb37e1756e36c5 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Fri, 3 Feb 2012 17:17:12 -0800
Subject: [PATCH] merge heads

---
 .../apps/mytracks/services/sensors/ant/AntSensorManager.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensorManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensorManager.java
index aca62f947..5e8e6ea8d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensorManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensorManager.java
@@ -97,8 +97,9 @@ public abstract class AntSensorManager extends SensorManager {
         if (DEBUGGING) {
           Log.d(TAG, "Received RX message " + messageToString(antMessage));
         }
-
-        handleMessage(antMessage);
+        if (getAntReceiver() != null) {
+          handleMessage(antMessage);
+        }
       }
     }
   };