drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
parent 1b3f178f85 d7e80b9d50
commit d8b243fea2
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/webkit/WebView.java
View File

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