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

Commit f35cb6bc authored by Carsten Hauge's avatar Carsten Hauge Committed by Yoshinori Hirano
Browse files

Avoid NullPointerException when updating preference intents 

Comparisons changed on the intent action. Sometimes an account
preference intent does not have an action specified.

Fixes: 67075850
Test: manual - go to Settings > Users & accounts and tap an account.

Change-Id: I54cebbc983b55aa1487a122d37ccd5c79bbf519d
parent de795d12

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.