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

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

Author: Jean-Baptiste Queru

core/java/android/widget/SearchView.java

@@ -1506,6 +1506,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