Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f38ed428 authored by Carsten Hauge's avatar Carsten Hauge Committed by android-build-merger
Browse files

Merge "Avoid NullPointerException when updating preference intents" 

am: c4b0fa58

Change-Id: I403d380ebfbbb0c70fdf5b6c9ff51267a5163e6f
parents 39ddac51 c4b0fa58

src/com/android/settings/accounts/AccountTypePreferenceLoader.java

+3 −2
Original line number Diff line number Diff line
@@ -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,7 +136,7 @@ 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(

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

                        android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS)) {

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

                    // will get fired.