Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07e6da0b authored by Bryan Mawhinney's avatar Bryan Mawhinney Committed by Android Git Automerger
Browse files

am f81ecc1f: Merge change I29232f2a into eclair 

Merge commit 'f81ecc1f' into eclair-mr2

* commit 'f81ecc1f':
  Only dismiss search dialog after launching intent.
parents eb329bf2 f81ecc1f

core/java/android/app/SearchDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -1314,13 +1314,13 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
            // source. this is because GlobalSearch may not have permission to launch the

            // intent, and to avoid the extra step of going through GlobalSearch.

            if (mGlobalSearchMode) {

                launchGlobalSearchIntent(intent);

                if (mStoredComponentName != null) {

                    // If we're embedded in an application, dismiss the dialog.

                    // This ensures that if the intent is handled by the current

                    // activity, it's not obscured by the dialog.

                    dismiss();

                }

                launchGlobalSearchIntent(intent);

            } else {

                // If the intent was created from a suggestion, it will always have an explicit

                // component here.