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

am: d4075ea983

Change-Id: Ie93718a9af3b3bb4e53dfbf7f43da31c1ee9404a

diff --cc src/com/android/settings/search/DatabaseIndexingManager.java
index 85ba869,1fbe055..4da0c7c
--- 1/src/com/android/settings/search/DatabaseIndexingManager.java
--- 2/src/com/android/settings/search/DatabaseIndexingManager.java
+++ b/src/com/android/settings/search/DatabaseIndexingManager.java
@@@ -39,11 -39,14 +39,14 @@@ import android.support.annotation.Visib
  import android.text.TextUtils;
  import android.util.AttributeSet;
  import android.util.Log;
+ import android.util.Pair;
  import android.util.Xml;
  
+ import com.android.internal.logging.nano.MetricsProto;
  import com.android.settings.SettingsActivity;
 -import com.android.settings.core.PreferenceController;
 +import com.android.settings.core.PreferenceControllerMixin;
  
+ import com.android.settings.overlay.FeatureFactory;
  import org.xmlpull.v1.XmlPullParser;
  import org.xmlpull.v1.XmlPullParserException;
  

diff --cc src/com/android/settings/search/SearchFragment.java
Simple merge

diff --cc tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
Simple merge