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

Fix NPE when instantiating SettingsPreferenceFragment

Browse Source 
Change-Id: I3997d6436f358b802dff9be307c36031f4351ab4
Fixes: 72868191
Test: robotests
This commit is contained in:
Fan Zhang
2018-02-02 12:15:37 -08:00
parent 7142be5630
commit a10004661c
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;
} }