From 79d0f6852d53aa3792cdf60565332de7c08304d5 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Sat, 2 Jun 2012 10:44:42 -0700
Subject: [PATCH] Improve AntSensorManager. Reduce checking sensor connection
 timer period to 20 seconds.

---
 .../services/sensors/SensorManager.java       |  4 +-
 .../sensors/ant/AntSensorManager.java         | 50 ++++++++++---------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManager.java
index eb63ce6a0..8b3787abf 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManager.java
@@ -33,8 +33,8 @@ public abstract class SensorManager {
 
   private static final String TAG = SensorManager.class.getSimpleName();
   private static final long MAX_SENSOR_DATE_SET_AGE = 5000;
-  private static final long MAX_SENSOR_STATE_AGE = 30000;
-  private static final int RETRY_PERIOD = 30000;
+  private static final long MAX_SENSOR_STATE_AGE = 20000;
+  private static final int RETRY_PERIOD = 20000;
 
   private SensorState sensorState = SensorState.NONE;
   private long sensorStateTimestamp = System.currentTimeMillis();
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 2ed9f6cf1..a227afa1a 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
@@ -126,28 +126,39 @@ public class AntSensorManager extends SensorManager {
   }
 
   @Override
-  protected void setUpChannel() {
+  protected synchronized void setUpChannel() {
+    tearDownChannel();
     if (AntInterface.hasAntSupport(context)) {
       context.registerReceiver(statusReceiver, statusIntentFilter);
       if (!antInterface.initService(context, serviceListener)) {
         AntInterface.goToMarket(context);
       } else {
         setSensorState(Sensor.SensorState.CONNECTING);
-        serviceConnected = antInterface.isServiceConnected();
-        if (serviceConnected) {
-          try {
-            hasClaimedInterface = antInterface.hasClaimedInterface();
-            if (hasClaimedInterface) {
-              enableDataMessage(true);
-            }
-          } catch (AntInterfaceException e) {
-            handleAntError();
-          }
-        }
+        handleServiceConnected();
       }
     }
   }
 
+  /**
+   * Handles service connected. Needs to be synchronized.
+   */
+  private synchronized void handleServiceConnected() {
+    serviceConnected = antInterface.isServiceConnected();
+    if (serviceConnected) {
+      try {
+        hasClaimedInterface = antInterface.hasClaimedInterface();
+        if (hasClaimedInterface) {
+          enableDataMessage(true);
+        } else {
+          // Need to claim the ant interface if it is available
+          hasClaimedInterface = antInterface.claimInterface();
+        }
+      } catch (AntInterfaceException e) {
+        handleAntError();
+      }
+    }
+  }
+  
   @Override
   protected void tearDownChannel() {
     try {
@@ -161,6 +172,7 @@ public class AntSensorManager extends SensorManager {
         if (hasClaimedInterface) {
           antInterface.releaseInterface();
         }
+        hasClaimedInterface = false;
         antInterface.stopRequestForceClaimInterface();
       } catch (AntServiceNotConnectedException e) {
         // Can safely ignore
@@ -168,6 +180,7 @@ public class AntSensorManager extends SensorManager {
         Log.w(TAG, "Exception in tearDonwChannel.", e);
       }
       antInterface.releaseService();
+      serviceConnected = false;
     }
   }
 
@@ -190,18 +203,7 @@ public class AntSensorManager extends SensorManager {
   private AntInterface.ServiceListener serviceListener = new AntInterface.ServiceListener() {
       @Override
     public void onServiceConnected() {
-      serviceConnected = true;
-      try {
-        hasClaimedInterface = antInterface.hasClaimedInterface();
-        if (hasClaimedInterface) {
-          enableDataMessage(true);
-        } else {
-          // Need to claim the ant interface if it is available
-          hasClaimedInterface = antInterface.claimInterface();
-        }
-      } catch (AntInterfaceException e) {
-        handleAntError();
-      }
+      handleServiceConnected();
     }
 
       @Override