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

Merge "Fix potential NPE with Preference highlighting"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-04-17 01:26:47 +00:00
committed by Android (Google) Code Review
parent 03006d2df2 5035ec6944
commit 03ae0fdc6d
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,6 +138,7 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
private int findPositionFromKey(String key) { private int findPositionFromKey(String key) {
final ListAdapter adapter = getListView().getAdapter(); final ListAdapter adapter = getListView().getAdapter();
if (adapter != null) {
final int count = adapter.getCount(); final int count = adapter.getCount();
for (int n = 0; n < count; n++) { for (int n = 0; n < count; n++) {
Object item = adapter.getItem(n); Object item = adapter.getItem(n);
@@ -149,6 +150,7 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
} }
} }
} }
}
return -1; return -1;
} }