| commit | cd0e8a6a37621c5820aa904da73a4e94efba4a88 | [log] [tgz] |
|---|---|---|
| author | Michael Kolb <kolby@google.com> | Mon Jan 24 15:02:47 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jan 24 15:02:47 2011 -0800 |
| tree | 0fe805a4044b785a6204d985266c8dbed77e7f39 | |
| parent | e08b6ea718ef54c61657311006f3ecafc4bf9279 [diff] | |
| parent | d1e2ccc38a2d5318a4ab06b2349cb43303fd6ceb [diff] |
Merge "fix tab NPE" into honeycomb
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java index 5deb335..568a7e9 100644 --- a/src/com/android/browser/BaseUi.java +++ b/src/com/android/browser/BaseUi.java
@@ -253,7 +253,7 @@ } private void attachTabToContentView(Tab tab) { - if (tab.getWebView() == null) { + if ((tab == null) || (tab.getWebView() == null)) { return; } View container = tab.getViewContainer();