From 82b6b63fc56663e0b6614e4d15396c76ec408a6e Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Thu, 16 May 2013 18:22:39 -0700
Subject: [PATCH] In SearchListActivity, only start MyTracksLocationManager
 when needed.

---
 .../google/android/apps/mytracks/SearchListActivity.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
index 69c4e9faf..b551d14d6 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
@@ -187,7 +187,6 @@ public class SearchListActivity extends AbstractSendToGoogleActivity
     trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null);
     searchEngine = new SearchEngine(myTracksProviderUtils);
     searchRecentSuggestions = SearchEngineProvider.newHelper(this);
-    myTracksLocationManager = new MyTracksLocationManager(this, Looper.myLooper());
 
     listView = (ListView) findViewById(R.id.search_list);
     listView.setEmptyView(findViewById(R.id.search_list_empty));
@@ -263,12 +262,6 @@ public class SearchListActivity extends AbstractSendToGoogleActivity
     trackRecordingServiceConnection.unbind();
   }
 
-  @Override
-  protected void onDestroy() {
-    super.onDestroy();
-    myTracksLocationManager.close();
-  }
-
   @Override
   protected int getLayoutResId() {
     return R.layout.search_list;
@@ -395,9 +388,11 @@ public class SearchListActivity extends AbstractSendToGoogleActivity
     final String textQuery = intent.getStringExtra(SearchManager.QUERY);
     setTitle(textQuery);
 
+    myTracksLocationManager = new MyTracksLocationManager(this, Looper.myLooper());
     LocationListener locationListener = new LocationListener() {
         @Override
       public void onLocationChanged(final Location location) {
+        myTracksLocationManager.close();
         new Thread() {
             @Override
           public void run() {