Merge "Add synchronous indexing api to SearchFeatureProvider" into oc-dr1-dev am: e2e54e17c7

am: d4075ea983

Change-Id: Ie93718a9af3b3bb4e53dfbf7f43da31c1ee9404a
This commit is contained in:
Matthew Fritze
2017-06-28 20:53:12 +00:00
committed by android-build-merger
6 changed files with 38 additions and 12 deletions

View File

@@ -35,6 +35,7 @@ import android.provider.SearchIndexableResource;
import android.util.ArrayMap;
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.testutils.DatabaseTestUtils;
@@ -131,6 +132,7 @@ public class DatabaseIndexingManagerTest {
mDb = IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
doReturn(mPackageManager).when(mContext).getPackageManager();
FakeFeatureFactory.setupForTest(mContext);
}
@After

View File

@@ -268,7 +268,7 @@ public class SearchFragmentTest {
.thenReturn(true);
fragment.onAttach(null);
verify(mFeatureFactory.searchFeatureProvider).updateIndex(any(Context.class),
verify(mFeatureFactory.searchFeatureProvider).updateIndexAsync(any(Context.class),
any(IndexingCallback.class));
}