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

Merge "Fix NPE when instantiating SettingsPreferenceFragment"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-02 23:38:21 +00:00
committed by Android (Google) Code Review
parent e07e8cc423 a10004661c
commit 6a4c3301ec
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/SettingsPreferenceFragment.java
View File

@@ -339,8 +339,10 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
@Override @Override
protected RecyclerView.Adapter onCreateAdapter(PreferenceScreen preferenceScreen) { protected RecyclerView.Adapter onCreateAdapter(PreferenceScreen preferenceScreen) {
final Bundle arguments = getArguments();
mAdapter = new HighlightablePreferenceGroupAdapter(preferenceScreen, mAdapter = new HighlightablePreferenceGroupAdapter(preferenceScreen,
getArguments().getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY), arguments == null
? null : arguments.getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY),
mPreferenceHighlighted); mPreferenceHighlighted);
return mAdapter; return mAdapter;
} }