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

Merge "Prevent failed dynamic index" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-14 14:58:51 +00:00
committed by Android (Google) Code Review
parent ede5041dd6 5ec0410e5b
commit 0c2eb1b553
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/search/BaseSearchIndexProvider.java
View File

@@ -128,8 +128,13 @@ public class BaseSearchIndexProvider implements Indexable.SearchIndexProvider {
} }
public List<AbstractPreferenceController> getPreferenceControllers(Context context) { public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllersFromCode = List<AbstractPreferenceController> controllersFromCode = new ArrayList<>();
createPreferenceControllers(context); try {
controllersFromCode = createPreferenceControllers(context);
} catch (Exception e) {
Log.w(TAG, "Error initial controller");
}
final List<SearchIndexableResource> res = getXmlResourcesToIndex(context, true); final List<SearchIndexableResource> res = getXmlResourcesToIndex(context, true);
if (res == null || res.isEmpty()) { if (res == null || res.isEmpty()) {
return controllersFromCode; return controllersFromCode;