summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-05-10 09:38:30 -0700
committerAndroid Code Review <code-review@android.com>2010-05-10 09:38:30 -0700
commitaa905e91eb3eadaa7b3de9ae1ac252225152af3c (patch)
tree72703eda606210ab62c42a0bbb36c5f049cbc7d3
parentc1358aadb57fe31b8cde564a7121b0991bae390b (diff)
parent794dc72387295a8f4126014351077d5bb1388a09 (diff)
downloadpackages_apps_Browser-aa905e91eb3eadaa7b3de9ae1ac252225152af3c.zip
packages_apps_Browser-aa905e91eb3eadaa7b3de9ae1ac252225152af3c.tar.gz
packages_apps_Browser-aa905e91eb3eadaa7b3de9ae1ac252225152af3c.tar.bz2
Merge "Fixing a monkey crash in the BrowserSettings"
-rw-r--r--src/com/android/browser/BrowserSettings.java5
1 files changed, 4 insertions, 1 deletions
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 @@ class BrowserSettings extends Observable {
/* package */ void clearFormData(Context context) {
WebViewDatabase.getInstance(context).clearFormData();
if (mTabControl != null) {
- mTabControl.getCurrentTopWebView().clearFormData();
+ WebView currentTopView = mTabControl.getCurrentTopWebView();
+ if (currentTopView != null) {
+ currentTopView.clearFormData();
+ }
}
}