Exit action mode when destroying the WebView or loading.

Bug: 3000317

Change-Id: I7f131d5c159058c33c3249ee4e0fee3a667ec6d8

1 files changed, 6 insertions, 0 deletions

diff --git a/core/java/android/webkit/FindActionModeCallback.java b/core/java/android/webkit/FindActionModeCallback.java
index 2299d4a0f04f..27043e0474cf 100644
--- a/core/java/android/webkit/FindActionModeCallback.java
+++ b/core/java/android/webkit/FindActionModeCallback.java
@@ -44,6 +44,7 @@ class FindActionModeCallback implements ActionMode.Callback, TextWatcher,
     private boolean mMatchesFound;
     private int mNumberOfMatches;
     private View mTitleBar;
+    private ActionMode mActionMode;
 
     FindActionModeCallback(Context context) {
         mCustomView = LayoutInflater.from(context).inflate(
@@ -63,6 +64,10 @@ class FindActionModeCallback implements ActionMode.Callback, TextWatcher,
 
     void setTitleBar(View v) { mTitleBar = v; }
 
+    void finish() {
+        mActionMode.finish();
+    }
+
     /*
      * Place text in the text field so it can be searched for.  Need to press
      * the find next or find previous button to find all of the matches.
@@ -156,6 +161,7 @@ class FindActionModeCallback implements ActionMode.Callback, TextWatcher,
         mode.setCustomView(mCustomView);
         mode.getMenuInflater().inflate(com.android.internal.R.menu.webview_find,
                 menu);
+        mActionMode = mode;
         Editable edit = mEditText.getText();
         Selection.setSelection(edit, edit.length());
         mMatches.setVisibility(View.GONE);