commit e2752f70a05d9189e645f296b2936d7a73d59d75
author Michael Kolb <kolby@google.com> Mon Oct 25 16:50:16 2010 -0700
committer Michael Kolb <kolby@google.com> Mon Oct 25 16:51:15 2010 -0700
tree 0e07757078d12ae5fc50e0ea847adc2bcdfe08bd
parent 374585f2b55832b781d45fe3ef0e64362d05a5f4

fix NPE when closing tab

    Bug: 3041603

Change-Id: Ifc77c576f072e5c78bf716f00d0efcb5b3ec2e86

src/com/android/browser/TabBar.java

diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java
index 432df9f..b2c687d 100644
--- a/src/com/android/browser/TabBar.java
+++ b/src/com/android/browser/TabBar.java
@@ -419,9 +419,11 @@
     @Override
     public void onRemoveTab(Tab tab) {
         TabViewData tvd = mTabMap.get(tab);
-        TabView tv = tvd.mTabView;
-        if (tv != null) {
-            mTabs.removeTab(tv);
+        if (tvd != null) {
+            TabView tv = tvd.mTabView;
+            if (tv != null) {
+                mTabs.removeTab(tv);
+            }
         }
         mTabMap.remove(tab);
     }