commit aa905e91eb3eadaa7b3de9ae1ac252225152af3c
author Jean-Baptiste Queru <jbq@google.com> Mon May 10 09:38:30 2010 -0700
committer Android Code Review <code-review@android.com> Mon May 10 09:38:30 2010 -0700
tree 72703eda606210ab62c42a0bbb36c5f049cbc7d3
parent c1358aadb57fe31b8cde564a7121b0991bae390b
parent 794dc72387295a8f4126014351077d5bb1388a09

Merge "Fixing a monkey crash in the BrowserSettings"

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 9c5af34..c3b6a08 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -515,7 +515,10 @@
     /* package */ void clearFormData(Context context) {
         WebViewDatabase.getInstance(context).clearFormData();
         if (mTabControl != null) {
-            mTabControl.getCurrentTopWebView().clearFormData();
+            WebView currentTopView = mTabControl.getCurrentTopWebView();
+            if (currentTopView != null) {
+                currentTopView.clearFormData();
+            }
         }
     }