rename nativeFindIsDown to nativeFindIsUp; check for null webkit

companion fix is in external/webkit

fixes bug http://b/issue?id=2264941

1 files changed, 4 insertions, 2 deletions

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 4414d6d..8b67162 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -2428,12 +2428,14 @@ public class WebView extends AbsoluteLayout
      * Clear the highlighting surrounding text matches created by findAll.
      */
     public void clearMatches() {
+        if (mNativeClass == 0)
+            return;
         if (mFindIsUp) {
             recordNewContentSize(mContentWidth, mContentHeight - mFindHeight,
                     false);
             mFindIsUp = false;
         }
-        nativeSetFindIsDown();
+        nativeSetFindIsUp();
         // Now that the dialog has been removed, ensure that we scroll to a
         // location that is not beyond the end of the page.
         pinScrollTo(mScrollX, mScrollY, false, 0);
@@ -5879,7 +5881,7 @@ public class WebView extends AbsoluteLayout
     private native void     nativeRecordButtons(boolean focused,
             boolean pressed, boolean invalidate);
     private native void     nativeSelectBestAt(Rect rect);
-    private native void     nativeSetFindIsDown();
+    private native void     nativeSetFindIsUp();
     private native void     nativeSetFollowedLink(boolean followed);
     private native void     nativeSetHeightCanMeasure(boolean measure);
     // Returns a value corresponding to CachedFrame::ImeAction