Merge "Query search result intent before launching to avoid crash" into oc-dr1-dev...

am: 81840033e3

Change-Id: I6898c45e13ee4418fb83d78e77303dbfa097888b

diff --cc tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
index 38e6285,53b3ca5..a3826f6
--- 1/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
--- 2/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
@@@ -82,10 -84,10 +84,10 @@@ public class IntentSearchViewHolderTes
          mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
  
          final Context context = RuntimeEnvironment.application;
-         View view = LayoutInflater.from(context).inflate(R.layout.search_intent_item, null);
+         final View view = LayoutInflater.from(context).inflate(R.layout.search_intent_item, null);
          mHolder = new IntentSearchViewHolder(view);
  
 -        mIcon = context.getDrawable(R.drawable.ic_search_history);
 +        mIcon = context.getDrawable(R.drawable.ic_search_24dp);
          mBadgedIcon = context.getDrawable(R.drawable.ic_add);
          when(mFragment.getActivity().getPackageManager()).thenReturn(mPackageManager);
      }