Wrap old search index update logic behind FeatureProvider.
Change-Id: I31024d2e7900a90b4f7dc8cc81951bf6a0e533fa
Fix: 34123028
Test: RunSettingsRoboTests
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 179e352..d5920e5 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -462,10 +462,7 @@
if (mIsShowingDashboard) {
// Run the Index update only if we have some space
if (!Utils.isLowStorage(this)) {
- long indexStartTime = System.currentTimeMillis();
- Index.getInstance(getApplicationContext()).update();
- if (DEBUG_TIMING) Log.d(LOG_TAG, "Index.update() took "
- + (System.currentTimeMillis() - indexStartTime) + " ms");
+ mSearchFeatureProvider.updateIndex(getApplicationContext());
} else {
Log.w(LOG_TAG, "Cannot update the Indexer as we are running low on storage space!");
}
diff --git a/src/com/android/settings/search2/SearchFeatureProviderImpl.java b/src/com/android/settings/search2/SearchFeatureProviderImpl.java
index 5aa21df..97b7bfe 100644
--- a/src/com/android/settings/search2/SearchFeatureProviderImpl.java
+++ b/src/com/android/settings/search2/SearchFeatureProviderImpl.java
@@ -19,19 +19,21 @@
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
+import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import com.android.settings.R;
-import com.android.settings.search.Index;
-
import com.android.settings.applications.PackageManagerWrapperImpl;
+import com.android.settings.search.Index;
/**
* FeatureProvider for the refactored search code.
*/
public class SearchFeatureProviderImpl implements SearchFeatureProvider {
+ private static final String TAG = "SearchFeatureProvider";
+
private DatabaseIndexingManager mDatabaseIndexingManager;
@Override
@@ -81,10 +83,12 @@
@Override
public void updateIndex(Context context) {
+ long indexStartTime = System.currentTimeMillis();
if (isEnabled(context)) {
getIndexingManager(context).update();
} else {
Index.getInstance(context).update();
}
+ Log.d(TAG, "Index.update() took " + (System.currentTimeMillis() - indexStartTime) + " ms");
}
}