summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-10-13 15:31:51 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-13 15:31:51 -0700
commit1024c1765e892432975510dddc784c1360975247 (patch)
treeeabedd29f6994498fc0a1ec502a9f02cec02fbed
parent315d502edce27bb4e93e53134f1a43b8f5c45588 (diff)
parent62077d8c4be592aa66ea270dcfc3fded6ae76034 (diff)
downloadpackages_apps_Browser-1024c1765e892432975510dddc784c1360975247.zip
packages_apps_Browser-1024c1765e892432975510dddc784c1360975247.tar.gz
packages_apps_Browser-1024c1765e892432975510dddc784c1360975247.tar.bz2
Merge "Add null check" into ics-mr0
-rw-r--r--src/com/android/browser/PhoneUi.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 56b5276..ffcaaf8 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -522,6 +522,9 @@ public class PhoneUi extends BaseUi {
}
public void set(TitleBar tbar, WebView web) {
+ if (tbar == null || web == null) {
+ return;
+ }
if (tbar.getWidth() > 0 && tbar.getEmbeddedHeight() > 0) {
if (mTitleBarBitmap == null
|| mTitleBarBitmap.getWidth() != tbar.getWidth()