summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2011-02-16 14:04:25 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-16 14:04:25 -0800
commit1390d79f846f8a5982542a7dee545d215d22dbeb (patch)
tree9e15e53a5744b805872ab06b6cf7cc5746f2fa55 /src/com/android
parent5beffcb8ded881099ffb9bc416067063702e60be (diff)
parentba86052c20067be2bdb1692b070f4bb8537ecb02 (diff)
downloadpackages_apps_Browser-1390d79f846f8a5982542a7dee545d215d22dbeb.tar.gz
packages_apps_Browser-1390d79f846f8a5982542a7dee545d215d22dbeb.tar.bz2
packages_apps_Browser-1390d79f846f8a5982542a7dee545d215d22dbeb.zip
Merge "look for null web views"
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/browser/Controller.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 9561cb620..e667d6717 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1468,10 +1468,8 @@ public class Controller
newtab.setEnabled(getTabControl().canCreateNewTab());
MenuItem archive = menu.findItem(R.id.save_webarchive_menu_id);
- String url = getCurrentTopWebView().getUrl();
- archive.setVisible(!TextUtils.isEmpty(url)
- && !url.endsWith("webarchivexml"));
-
+ String url = w != null ? w.getUrl() : null;
+ archive.setVisible(url != null && !url.endsWith(".webarchivexml"));
break;
}
mCurrentMenuState = mMenuState;