Merge "Revert^2 "Support search "Mobile data""" into main

This commit is contained in:
Chaohui Wang
2024-07-15 05:35:40 +00:00
committed by Android (Google) Code Review
8 changed files with 247 additions and 4 deletions

View File

@@ -29,6 +29,7 @@ import android.database.Cursor;
import android.text.TextUtils;
import com.android.settings.network.NetworkProviderSettings;
import com.android.settings.spa.search.SearchablePage;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.FakeIndexProvider;
import com.android.settingslib.search.SearchIndexableData;
@@ -117,8 +118,10 @@ public class SearchIndexableResourcesTest {
public void testAllClassNamesHaveProviders() {
for (SearchIndexableData data :
mSearchProvider.getSearchIndexableResources().getProviderValues()) {
if (DatabaseIndexingUtils.getSearchIndexProvider(data.getTargetClass()) == null) {
fail(data.getTargetClass().getName() + "is not an index provider");
Class<?> targetClass = data.getTargetClass();
if (DatabaseIndexingUtils.getSearchIndexProvider(targetClass) == null
&& !SearchablePage.class.isAssignableFrom(targetClass)) {
fail(targetClass.getName() + " is not an index provider");
}
}
}