From 74073b641fbb50a31379fb25562582c63db9c646 Mon Sep 17 00:00:00 2001 From: Matthew Simmons Date: Fri, 11 Mar 2011 16:06:30 -0500 Subject: [PATCH] Check for null preferences before trying to use them --- .../android/apps/mytracks/MyTracksSettings.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracksSettings.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracksSettings.java index 085b93e46..85e6a04b5 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MyTracksSettings.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracksSettings.java @@ -232,10 +232,14 @@ public class MyTracksSettings extends PreferenceActivity { // Update the ANT+ sensors. // TODO: Only enable on phones that have ANT+. - findPreference(getString(R.string.ant_heart_rate_sensor_id_key)) - .setEnabled(getString(R.string.ant_sensor_type).equals(sensorType)); - findPreference(getString(R.string.ant_srm_bridge_sensor_id_key)) - .setEnabled(getString(R.string.srm_ant_bridge_sensor_type).equals(sensorType)); + Preference antHrm = findPreference(getString(R.string.ant_heart_rate_sensor_id_key)); + Preference antSrm = findPreference(getString(R.string.ant_srm_bridge_sensor_id_key)); + if (antHrm != null && antSrm != null) { + antHrm + .setEnabled(getString(R.string.ant_sensor_type).equals(sensorType)); + antSrm + .setEnabled(getString(R.string.srm_ant_bridge_sensor_type).equals(sensorType)); + } } /**