summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author lge-aosp <lge-aosp@lge.com> 2011-03-15 10:25:57 +0900
committer lge-aosp <lge-aosp@lge.com> 2011-03-15 10:25:57 +0900
commit06ca9977d41f0d3739a06e26171a2b1b142fcef4 (patch)
tree953e57bb68cb1a232326de30de949ea3e3e5987c
parent2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d (diff)
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 Change-Id: I9c24d83ca3b7c20976bb7daebeff7fd694ce3a2f
-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 da8c9e566977..d70ec0b8b00b 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;