am d7e80b9d: Merge "fix NPE in getSearchBox" into honeycomb-mr1

* commit 'd7e80b9d5046603ac4a36ea74e204a2ad70a4dca':
  fix NPE in getSearchBox
This commit is contained in:
Michael Kolb
2011-03-04 00:16:22 -08:00
committed by Android Git Automerger

View File

@ -5036,6 +5036,9 @@ public class WebView extends AbsoluteLayout
* @hide pending API Council approval.
*/
public SearchBox getSearchBox() {
if ((mWebViewCore == null) || (mWebViewCore.getBrowserFrame() == null)) {
return null;
}
return mWebViewCore.getBrowserFrame().getSearchBox();
}