Merge "Do not attempt to start action mode if there is no parent." into honeycomb-mr1 (055a8585) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebView.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -3017,7 +3017,8 @@ public class WebView extends AbsoluteLayout
		}

		/**
		* Start an ActionMode for finding text in this WebView.
		* Start an ActionMode for finding text in this WebView. Only works if this
		* WebView is attached to the view system.
		* @param text If non-null, will be the initial text to search for.
		* Otherwise, the last String searched for in this WebView will
		* be used to start.
		@@ -3027,7 +3028,7 @@ public class WebView extends AbsoluteLayout
		*/
		public boolean showFindDialog(String text, boolean showIme) {
		FindActionModeCallback callback = new FindActionModeCallback(mContext);
		if (startActionMode(callback) == null) {
		if (getParent() == null \|\| startActionMode(callback) == null) {
		// Could not start the action mode, so end Find on page
		return false;
		}