Commit 06ca9977 authored Mar 15, 2011 by lge-aosp

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

parent 2fdf829a

core/java/android/app/Dialog.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;