diff options
| author | Selim Gurun <sgurun@google.com> | 2012-09-12 15:13:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-12 15:13:43 -0700 |
| commit | 5977ecef0e77362943c7d9ee48190514ccf3cd4b (patch) | |
| tree | 269e5ec4636c7fa1448e9daefe71818814af7040 /core/java/android/webkit/WebViewClassic.java | |
| parent | 565717e612dc9b36dfecce3e50b7bf7d8e3b2fab (diff) | |
| parent | a7a5fa82cc997953b0206c4dd1d2ecc1b27f0cf2 (diff) | |
am a7a5fa82: am 06ee8cde: Merge "Remove defunct searchbox implementation from webview." into jb-mr1-dev
* commit 'a7a5fa82cc997953b0206c4dd1d2ecc1b27f0cf2':
Remove defunct searchbox implementation from webview.
Diffstat (limited to 'core/java/android/webkit/WebViewClassic.java')
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index 9f05f76d0db6..e5db5dd493f7 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -5367,10 +5367,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc * This is an implementation detail. */ public SearchBox getSearchBox() { - if ((mWebViewCore == null) || (mWebViewCore.getBrowserFrame() == null)) { - return null; - } - return mWebViewCore.getBrowserFrame().getSearchBox(); + return null; } /** |