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

Remove context from dashboardFeatureProvider

Browse Source 
DashboardFeatureProviderImpl is created by using application context,
no need pass context in when get.

Bug: 286764889
Test: m Settings
Change-Id: Ia9672dfd9d3d71f64735cbc5979a6ad57c9429d3
This commit is contained in:
Chaohui Wang
2023-07-20 12:21:16 +08:00
parent 1ac510e4b1
commit 58f0ee30fc
8 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/search/SettingsSearchIndexablesProvider.java
View File

@@ -173,7 +173,7 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider {
public Cursor queryDynamicRawData(String[] projection) {
final Context context = getContext();
final List<SearchIndexableRaw> rawList = new ArrayList<>();
final Collection<SearchIndexableData> bundles = FeatureFactory.getFactory(context)
final Collection<SearchIndexableData> bundles = FeatureFactory.getFeatureFactory()
.getSearchFeatureProvider().getSearchIndexableResources().getProviderValues();
for (SearchIndexableData bundle : bundles) {
@@ -200,8 +200,8 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider {
final MatrixCursor cursor = new MatrixCursor(SITE_MAP_COLUMNS);
final Context context = getContext();
// Loop through all IA categories and pages and build additional SiteMapPairs
final List<DashboardCategory> categories = FeatureFactory.getFactory(context)
.getDashboardFeatureProvider(context).getAllCategories();
final List<DashboardCategory> categories = FeatureFactory.getFeatureFactory()
.getDashboardFeatureProvider().getAllCategories();
for (DashboardCategory category : categories) {
// Use the category key to look up parent (which page hosts this key)
final String parentClass = CATEGORY_KEY_TO_PARENT_MAP.get(category.key);
@@ -271,7 +271,7 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider {
}
private List<String> getNonIndexableKeysFromProvider(Context context) {
final Collection<SearchIndexableData> bundles = FeatureFactory.getFactory(context)
final Collection<SearchIndexableData> bundles = FeatureFactory.getFeatureFactory()
.getSearchFeatureProvider().getSearchIndexableResources().getProviderValues();
final List<String> nonIndexableKeys = new ArrayList<>();
@@ -322,7 +322,7 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider {
}
private List<SearchIndexableResource> getSearchIndexableResourcesFromProvider(Context context) {
final Collection<SearchIndexableData> bundles = FeatureFactory.getFactory(context)
final Collection<SearchIndexableData> bundles = FeatureFactory.getFeatureFactory()
.getSearchFeatureProvider().getSearchIndexableResources().getProviderValues();
List<SearchIndexableResource> resourceList = new ArrayList<>();
@@ -348,7 +348,7 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider {
}
private List<SearchIndexableRaw> getSearchIndexableRawFromProvider(Context context) {
final Collection<SearchIndexableData> bundles = FeatureFactory.getFactory(context)
final Collection<SearchIndexableData> bundles = FeatureFactory.getFeatureFactory()
.getSearchFeatureProvider().getSearchIndexableResources().getProviderValues();
final List<SearchIndexableRaw> rawList = new ArrayList<>();
@@ -392,7 +392,7 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider {
@VisibleForTesting
List<SearchIndexableRaw> getInjectionIndexableRawData(Context context) {
final DashboardFeatureProvider dashboardFeatureProvider =
FeatureFactory.getFactory(context).getDashboardFeatureProvider(context);
FeatureFactory.getFeatureFactory().getDashboardFeatureProvider();
final List<SearchIndexableRaw> rawList = new ArrayList<>();
final String currentPackageName = context.getPackageName();
for (DashboardCategory category : dashboardFeatureProvider.getAllCategories()) {