Merge change 7941 into donut
* changes:
add comment to illuminate why we only dismiss the dialog when launching an intent for in app search
diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java
index c7d26d2..27c6376 100644
--- a/core/java/android/app/SearchDialog.java
+++ b/core/java/android/app/SearchDialog.java
@@ -1247,6 +1247,9 @@
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();
}