diff options
| author | Michael Kolb <kolby@google.com> | 2011-03-03 17:09:19 -0800 |
|---|---|---|
| committer | Michael Kolb <kolby@google.com> | 2011-03-03 17:09:27 -0800 |
| commit | b748186c7099b1b3ffc9bf28f4c5a47c81689a43 (patch) | |
| tree | a282d0c3927c9cad39f71d9ff723842b379ed558 /core/java/android/webkit/WebView.java | |
| parent | 268c7111f65c1f27598464c5f29ef4621bbf0407 (diff) | |
| download | frameworks_base-b748186c7099b1b3ffc9bf28f4c5a47c81689a43.zip frameworks_base-b748186c7099b1b3ffc9bf28f4c5a47c81689a43.tar.gz frameworks_base-b748186c7099b1b3ffc9bf28f4c5a47c81689a43.tar.bz2 | |
fix NPE in getSearchBox
Bug: 3510741
added null check
Change-Id: I256375b2168942f0b4b700912f2f2ae40ce90492
Diffstat (limited to 'core/java/android/webkit/WebView.java')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 975f815..642cd02 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -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(); } |