Merge "Fix potential NPE with Preference highlighting"

src/com/android/settings/SettingsPreferenceFragment.java

@@ -138,6 +138,7 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
 
     private int findPositionFromKey(String key) {
         final ListAdapter adapter = getListView().getAdapter();
+        if (adapter != null) {
             final int count = adapter.getCount();
             for (int n = 0; n < count; n++) {
                 Object item = adapter.getItem(n);
@@ -149,6 +150,7 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
                     }
                 }
             }
+        }
         return -1;
     }