Merge "Avoid NullPointerException when updating preference intents"

import android.support.v7.preference.Preference.OnPreferenceClickListener;

import android.support.v7.preference.PreferenceGroup;

import android.support.v7.preference.PreferenceScreen;

import android.text.TextUtils;

import android.util.Log;

import com.android.settings.R;

                // startPreferencePanel() there. In order to inject the title string there, more

                // dirty further hack is still needed. It's much easier and cleaner to listen to

                // preference click event here directly.

                if (intent.getAction().equals(

                if (TextUtils.equals(intent.getAction(),

                        android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS)) {

                    // The OnPreferenceClickListener overrides the click event completely. No intent

                    // will get fired.