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

Commit 6a4c3301 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when instantiating SettingsPreferenceFragment"

parents e07e8cc4 a1000466

src/com/android/settings/SettingsPreferenceFragment.java

+3 −1
Original line number Diff line number Diff line
@@ -339,8 +339,10 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF 


    @Override

    protected RecyclerView.Adapter onCreateAdapter(PreferenceScreen preferenceScreen) {

        final Bundle arguments = getArguments();

        mAdapter = new HighlightablePreferenceGroupAdapter(preferenceScreen,

                getArguments().getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY),

                arguments == null

                        ? null : arguments.getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY),

                mPreferenceHighlighted);

        return mAdapter;

    }