diff options
| author | Conley Owens <cco3@android.com> | 2011-04-29 17:07:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-29 17:07:14 -0700 |
| commit | c30d767628861b0bbea907824682e47732c820f9 (patch) | |
| tree | a9d5ec0779054fd2f2d46df8f139b7940d29c7a7 /core/java/android/app | |
| parent | faedfc1e9be10ab29d563b7aede57cdac6e44799 (diff) | |
| parent | 1a846ab089878a6b342c6bc3e8850fc2e0ef3080 (diff) | |
| download | frameworks_base-c30d767628861b0bbea907824682e47732c820f9.zip frameworks_base-c30d767628861b0bbea907824682e47732c820f9.tar.gz frameworks_base-c30d767628861b0bbea907824682e47732c820f9.tar.bz2 | |
am 1a846ab0: am b1578d85: 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 >
* commit '1a846ab089878a6b342c6bc3e8850fc2e0ef3080':
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.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java index 087753b..82186dd 100644 --- a/core/java/android/app/Dialog.java +++ b/core/java/android/app/Dialog.java @@ -931,7 +931,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; |