commit 650f42f1d22e6fd51b3838662e141d9fb906c6f9
author The Android Open Source Project <initial-contribution@android.com> Mon May 10 12:26:23 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon May 10 12:26:23 2010 -0700
tree d7f7a640eed3493e662c4081800cc578703a98ab
parent 3e20445506307d2c8d699e1d17fb82a0cedde1d0
parent 6e37c92115b2f407972b190f337af8dab6a2ae19

am 6e37c921: merge from open-source master

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();
+            }
         }
     }