diff options
| author | John Reck <jreck@google.com> | 2011-10-13 15:33:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-13 15:33:21 -0700 |
| commit | 5ac074d5aeb27992822b165e4accc9ea00e71efb (patch) | |
| tree | 8b6decfdcc2037ee47706c1a6ede1488778faa8e /src/com | |
| parent | 850b3a72c5c380f24075cfccb1e329662bb90b35 (diff) | |
| parent | 1024c1765e892432975510dddc784c1360975247 (diff) | |
| download | packages_apps_Browser-5ac074d5aeb27992822b165e4accc9ea00e71efb.zip packages_apps_Browser-5ac074d5aeb27992822b165e4accc9ea00e71efb.tar.gz packages_apps_Browser-5ac074d5aeb27992822b165e4accc9ea00e71efb.tar.bz2 | |
am 1024c176: Merge "Add null check" into ics-mr0
* commit '1024c1765e892432975510dddc784c1360975247':
Add null check
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/browser/PhoneUi.java | 3 |
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() |