am 2acbec49: Merge change 7941 into donut

Merge commit '2acbec4918db4ab6eca32cf427ffd771c9efe35f'

* commit '2acbec4918db4ab6eca32cf427ffd771c9efe35f':
  add comment to illuminate why we only dismiss the dialog when launching an intent for in app search

1 files changed, 3 insertions, 0 deletions

diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java
index c7d26d232dae..27c637652d5e 100644
--- a/core/java/android/app/SearchDialog.java
+++ b/core/java/android/app/SearchDialog.java
@@ -1247,6 +1247,9 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
         Log.d(LOG_TAG, "launching " + intent);
         getContext().startActivity(intent);
 
+        // in global search mode, SearchDialogWrapper#performActivityResuming will handle hiding
+        // the dialog when the next activity starts, but for in-app search, we still need to
+        // dismiss the dialog.
         if (!mGlobalSearchMode) {
             dismiss();
         }