summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorBryan Mawhinney <bryanmawhinney@google.com>2009-10-07 13:02:35 +0100
committerBryan Mawhinney <bryanmawhinney@google.com>2009-10-07 13:02:35 +0100
commit214b6b9ef91320cd7b2eab592fbe0eec1614f3cb (patch)
tree25afa3cec106351cd4cea91dc7649273a280bbc4 /core
parent4625758d0b909ccfc9f40b707666b1b21e9e8ffd (diff)
downloadframeworks_base-214b6b9ef91320cd7b2eab592fbe0eec1614f3cb.zip
frameworks_base-214b6b9ef91320cd7b2eab592fbe0eec1614f3cb.tar.gz
frameworks_base-214b6b9ef91320cd7b2eab592fbe0eec1614f3cb.tar.bz2
Only dismiss search dialog after launching intent.
This fixes an NPE that occurs when launching the intent tries to access state cleared by onStop. Bug: 2171752 Change-Id: I29232f2a44d8dfa27b2c79933093c0c8983b2e92
Diffstat (limited to 'core')
-rw-r--r--core/java/android/app/SearchDialog.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java
index 933c2fc..697ac76 100644
--- a/core/java/android/app/SearchDialog.java
+++ b/core/java/android/app/SearchDialog.java
@@ -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.