Merge "Prevent failed dynamic index" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
0c2eb1b553
@@ -128,8 +128,13 @@ public class BaseSearchIndexProvider implements Indexable.SearchIndexProvider {
|
||||
}
|
||||
|
||||
public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllersFromCode =
|
||||
createPreferenceControllers(context);
|
||||
List<AbstractPreferenceController> controllersFromCode = new ArrayList<>();
|
||||
try {
|
||||
controllersFromCode = createPreferenceControllers(context);
|
||||
} catch (Exception e) {
|
||||
Log.w(TAG, "Error initial controller");
|
||||
}
|
||||
|
||||
final List<SearchIndexableResource> res = getXmlResourcesToIndex(context, true);
|
||||
if (res == null || res.isEmpty()) {
|
||||
return controllersFromCode;
|
||||
|
Reference in New Issue
Block a user