commit 6e37c92115b2f407972b190f337af8dab6a2ae19
author The Android Open Source Project <initial-contribution@android.com> Mon May 10 12:20:49 2010 -0700
committer The Android Open Source Project <initial-contribution@android.com> Mon May 10 12:20:49 2010 -0700
tree 4bc3cd14e0efba93510c83c49b32984bcf39f5d7
parent dad488c3f744044820cff075520de45134d39b40
parent aa905e91eb3eadaa7b3de9ae1ac252225152af3c

merge from open-source master

Change-Id: Iaaf00603ec92506775c28cc6a4cc587d3a02939a

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 51b4eaa..3d5ca03 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -503,7 +503,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();
+            }
         }
     }