Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8b243fe authored by Michael Kolb's avatar Michael Kolb Committed by Android Git Automerger
Browse files

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

* commit 'd7e80b9d':
  fix NPE in getSearchBox
parents 1b3f178f d7e80b9d

core/java/android/webkit/WebView.java

+3 −0
Original line number Diff line number Diff line
@@ -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();

    }