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

Remove search indexing pipeline from Settings

Browse Source 
Index is already handled by SettingsIntelligenec. No longer needed in
Settings.

Change-Id: Id43fb3100dc2759185744441cff8cb9cd2d2da20
Fixes: 69808376
Test: robotests
This commit is contained in:
Fan Zhang
2018-06-20 14:02:56 -07:00
parent 8691fed1cb
commit 7431c91de6
56 changed files with 42 additions and 4625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/com/android/settings/search/SearchFeatureProviderImpl.java
View File

@@ -21,14 +21,9 @@ import android.content.ComponentName;
import android.content.Context;
import android.text.TextUtils;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.indexing.IndexData;
import com.android.settingslib.search.SearchIndexableResources;
import com.android.settingslib.search.SearchIndexableResourcesMobile;
import java.util.Locale;
/**
* FeatureProvider for the refactored search code.
*/
@@ -36,8 +31,6 @@ public class SearchFeatureProviderImpl implements SearchFeatureProvider {
private static final String TAG = "SearchFeatureProvider";
private static final String METRICS_ACTION_SETTINGS_INDEX = "search_synchronous_indexing";
private DatabaseIndexingManager mDatabaseIndexingManager;
private SearchIndexableResources mSearchIndexableResources;
@Override
@@ -58,23 +51,6 @@ public class SearchFeatureProviderImpl implements SearchFeatureProvider {
+ "whitelisted package.");
}
@Override
public DatabaseIndexingManager getIndexingManager(Context context) {
if (mDatabaseIndexingManager == null) {
mDatabaseIndexingManager = new DatabaseIndexingManager(context.getApplicationContext());
}
return mDatabaseIndexingManager;
}
@Override
public void updateIndex(Context context) {
long indexStartTime = System.currentTimeMillis();
getIndexingManager(context).performIndexing();
int indexingTime = (int) (System.currentTimeMillis() - indexStartTime);
FeatureFactory.getFactory(context).getMetricsFeatureProvider()
.histogram(context, METRICS_ACTION_SETTINGS_INDEX, indexingTime);
}
@Override
public SearchIndexableResources getSearchIndexableResources() {
if (mSearchIndexableResources == null) {
@@ -86,20 +62,4 @@ public class SearchFeatureProviderImpl implements SearchFeatureProvider {
protected boolean isSignatureWhitelisted(Context context, String callerPackage) {
return false;
}
/**
* A generic method to make the query suitable for searching the database.
*
* @return the cleaned query string
*/
@VisibleForTesting
String cleanQuery(String query) {
if (TextUtils.isEmpty(query)) {
return null;
}
if (Locale.getDefault().equals(Locale.JAPAN)) {
query = IndexData.normalizeJapaneseString(query);
}
return query.trim();
}
}