fix comments for da7d78b18f25

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

@@ -167,7 +167,7 @@ public class SensorStateActivity extends Activity {
 
     // If no temp sensor manager is present, create one, and start it.
     if (tempSensorManager == null) {
-      tempSensorManager = SensorManagerFactory.getSensorManager(this);
+      tempSensorManager = SensorManagerFactory.getInstance().getSensorManager(this);
     }
 
     //  If a temp sensor manager is available, use states from temp sensor
@@ -224,7 +224,7 @@ public class SensorStateActivity extends Activity {
    */
   private void stopTempSensorManager() {
     if (tempSensorManager != null) {
-      SensorManagerFactory.releaseSensorManager(tempSensorManager);
+      SensorManagerFactory.getInstance().releaseSensorManager(tempSensorManager);
       tempSensorManager = null;
     }
   }

MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java

@@ -358,7 +358,7 @@ public class TrackRecordingService extends Service {
     unregisterLocationListener();
     shutdownTaskExecutors();
     if (sensorManager != null) {
-      SensorManagerFactory.releaseSensorManager(sensorManager);
+      SensorManagerFactory.getInstance().releaseSensorManager(sensorManager);
       sensorManager = null;
     }
 
@@ -601,7 +601,7 @@ public class TrackRecordingService extends Service {
     length = 0;
     showNotification();
     registerLocationListener();
-    sensorManager = SensorManagerFactory.getSensorManager(this);    
+    sensorManager = SensorManagerFactory.getInstance().getSensorManager(this);
 
     // Reset the number of auto-resume retries.
     setAutoResumeTrackRetries(0);
@@ -1035,7 +1035,7 @@ public class TrackRecordingService extends Service {
     prefManager.setRecordingTrack(recordingTrackId = -1);
 
     if (sensorManager != null) {
-      SensorManagerFactory.releaseSensorManager(sensorManager);
+      SensorManagerFactory.getInstance().releaseSensorManager(sensorManager);
       sensorManager = null;
     }
 

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

@@ -31,15 +31,28 @@ import android.util.Log;
  */
 public class SensorManagerFactory {
 
+  private String activeSensorType;
+  private SensorManager activeSensorManager;
+  private int refCount;
+
+  private static SensorManagerFactory instance = new SensorManagerFactory();
+
   private SensorManagerFactory() {
   }
 
+  /**
+   * Get the factory instance. 
+   */
+  public static SensorManagerFactory getInstance() {
+    return instance;
+  }
+
   /**
    * Get and start a new sensor manager.
    * @param context Context to fetch system preferences.
    * @return The sensor manager that corresponds to the sensor type setting.
    */
-  public static SensorManager getSensorManager(Context context) {
+  public SensorManager getSensorManager(Context context) {
     SharedPreferences prefs = context.getSharedPreferences(
         Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
     if (prefs == null) {
@@ -83,8 +96,7 @@ public class SensorManagerFactory {
   /**
    * Finish using a sensor manager.
    */
-
+  public void releaseSensorManager(SensorManager sensorManager) {
-  public static void releaseSensorManager(SensorManager sensorManager) {
     Log.i(Constants.TAG, "releaseSensorManager: " + activeSensorType + " " + refCount);
     if (sensorManager != activeSensorManager) {
       Log.e(Constants.TAG, "invalid parameter to releaseSensorManager");
@@ -95,7 +107,7 @@ public class SensorManagerFactory {
     reset();
   }
 
-  private static void reset() {
+  private void reset() {
     activeSensorType = null;
     if (activeSensorManager != null) {
       activeSensorManager.shutdown();
@@ -103,8 +115,4 @@ public class SensorManagerFactory {
     activeSensorManager = null;
     refCount = 0;
   }
-
-  private static String activeSensorType = null;
-  private static SensorManager activeSensorManager = null;
-  private static int refCount = 0;
 }

MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java

@@ -26,7 +26,7 @@ public class SensorManagerFactoryTest extends AndroidTestCase {
 
   @SmallTest
   public void testDefaultSettings() throws Exception {
-    assertNull(SensorManagerFactory.getSensorManager(getContext()));
+    assertNull(SensorManagerFactory.getInstance().getSensorManager(getContext()));
   }
 
   @SmallTest
@@ -49,9 +49,9 @@ public class SensorManagerFactoryTest extends AndroidTestCase {
         .putString(getContext().getString(R.string.sensor_type_key),
             getContext().getString(i))
         .apply();
-    SensorManager sm = SensorManagerFactory.getSensorManager(getContext());
+    SensorManager sm = SensorManagerFactory.getInstance().getSensorManager(getContext());
     assertNotNull(sm);
     assertTrue(c.isInstance(sm));
-    SensorManagerFactory.releaseSensorManager(sm);
+    SensorManagerFactory.getInstance().releaseSensorManager(sm);
   }
 }