am ad17717: am d3b74b9: am b307ceb: Merge "SearchWidget: passing APP_DATA to voice intent"

* commit 'ad17717e52576a05dffd1b99c06c46a80c149722':
  SearchWidget: passing APP_DATA to voice intent

Author: Jean-Baptiste Queru

core/java/android/widget/SearchView.java

@@ -1517,6 +1517,9 @@ private Intent createVoiceAppSearchIntent(Intent baseIntent, SearchableInfo sear
         // because the voice search activity will always need to insert "QUERY" into
         // it anyway.
         Bundle queryExtras = new Bundle();
+        if (mAppSearchData != null) {
+            queryExtras.putParcelable(SearchManager.APP_DATA, mAppSearchData);
+        }
 
         // Now build the intent to launch the voice search.  Add all necessary
         // extras to launch the voice recognizer, and then all the necessary extras