PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid NullPointerException when updating preference intents"

Browse Source
This commit is contained in:
Treehugger Robot
2017-10-02 17:56:02 +00:00
committed by Gerrit Code Review
parent de795d12d1 f35cb6bc91
commit c4b0fa5858
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/accounts/AccountTypePreferenceLoader.java
View File

@@ -34,6 +34,7 @@ import android.support.v7.preference.Preference;
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;
@@ -135,8 +136,8 @@ public class AccountTypePreferenceLoader {
// 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(
android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS)) {
if (TextUtils.equals(intent.getAction(),
android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS)) {
// The OnPreferenceClickListener overrides the click event completely. No intent
// will get fired.
pref.setOnPreferenceClickListener(new FragmentStarter(