commit | 464bf23688db3049741779554bb1c8276699bd56 | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Mon Mar 22 18:19:10 2010 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Mar 22 18:19:10 2010 -0700 |
tree | e4e2e4a3deac3c1ceb22e1f5bdf44d3a34a52fce | |
parent | c021e02fd464b91913e369229ed84348f554d150 [diff] | |
parent | f657b63c1c20252e1b0eb0646efb479420c828be [diff] |
Merge "Fix restoring of permissions after a reboot."
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index cabda85..b5eb5d5 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java
@@ -2618,6 +2618,9 @@ * @hide */ public void notifyFindDialogDismissed() { + if (mWebViewCore == null) { + return; + } clearMatches(); setFindIsUp(false); recordNewContentSize(mContentWidth, mContentHeight - mFindHeight,