Merge "Extending SearchFeatureProvider API to provide timeout" into oc-mr1-dev am: f83b94aa0c

am: 4e4d3631fc

Change-Id: I5207a13fa2997cad393ec60d5f0cfb93eecbde16

tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java

@@ -83,6 +83,8 @@ public class SearchResultsAdapterTest {
         mLoaderClassName = DatabaseResultLoader.class.getName();
         when(mFragment.getContext()).thenReturn(mMockContext);
         when(mMockContext.getApplicationContext()).thenReturn(mContext);
+        when(mSearchFeatureProvider.smartSearchRankingTimeoutMs(any(Context.class)))
+                .thenReturn(300L);
         mAdapter = new SearchResultsAdapter(mFragment, mSearchFeatureProvider);
     }