summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2011-04-29 09:59:48 -0700
committerAndroid Code Review <code-review@android.com>2011-04-29 09:59:48 -0700
commitb1578d85ce1b3f3c5e2cf0271011c016b93b7e1a (patch)
tree0bf1d4f7508345b566fad3d81867fb6ba26bd5c5 /core/java/android/app
parent1ecd0a9b28f8d608cac1a1db6c9bd493ace0ca3e (diff)
parent06ca9977d41f0d3739a06e26171a2b1b142fcef4 (diff)
downloadframeworks_base-b1578d85ce1b3f3c5e2cf0271011c016b93b7e1a.zip
frameworks_base-b1578d85ce1b3f3c5e2cf0271011c016b93b7e1a.tar.gz
frameworks_base-b1578d85ce1b3f3c5e2cf0271011c016b93b7e1a.tar.bz2
Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown"
Diffstat (limited to 'core/java/android/app')
-rw-r--r--core/java/android/app/Dialog.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java
index da8c9e5..d70ec0b 100644
--- a/core/java/android/app/Dialog.java
+++ b/core/java/android/app/Dialog.java
@@ -823,7 +823,7 @@ public class Dialog implements DialogInterface, Window.Callback,
// associate search with owner activity
final ComponentName appName = getAssociatedActivity();
- if (appName != null) {
+ if (appName != null && searchManager.getSearchableInfo(appName) != null) {
searchManager.startSearch(null, false, appName, null, false);
dismiss();
return true;