From 28ce9a1656ea834766f88e16a80c4bf85d8fe938 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Wed, 21 Dec 2011 17:37:34 -0800
Subject: [PATCH] Fix bluetooth crashes in issue 681.

---
 MyTracks/res/xml/preferences.xml                              | 2 +-
 .../mytracks/services/sensors/BluetoothSensorManager.java     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/MyTracks/res/xml/preferences.xml b/MyTracks/res/xml/preferences.xml
index 00765d88f..793389df8 100644
--- a/MyTracks/res/xml/preferences.xml
+++ b/MyTracks/res/xml/preferences.xml
@@ -167,7 +167,7 @@ limitations under the License.
       <ListPreference android:key="@string/bluetooth_sensor_key"
                       android:title="@string/settings_sensor_bluetooth_sensor"
                       android:summary="@string/settings_sensor_bluetooth_sensor_summary"
-                      android:defaultValue="any" />
+                      android:defaultValue="" />
 
       <Preference android:key="@string/bluetooth_pairing_key"
                   android:title="@string/settings_sensor_bluetooth_pairing"
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/BluetoothSensorManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/BluetoothSensorManager.java
index c3c575a84..11fba9a47 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/BluetoothSensorManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/BluetoothSensorManager.java
@@ -130,8 +130,8 @@ public class BluetoothSensorManager extends SensorManager {
     SharedPreferences prefs = context.getSharedPreferences(
         Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
     String address =
-      prefs.getString(context.getString(R.string.bluetooth_sensor_key), null);
-    if (address == null) {
+      prefs.getString(context.getString(R.string.bluetooth_sensor_key), "");
+    if (address.isEmpty()) {
       return;
     }
     Log.w(Constants.TAG, "Connecting to bluetooth sensor: " + address);