commit 1a4625a4fa1f3aae01de5cee5338ee4552edd3e8
author Michael Kolb <kolby@google.com> Wed Aug 24 13:40:44 2011 -0700
committer Michael Kolb <kolby@google.com> Wed Aug 24 13:40:44 2011 -0700
tree 3efbf3edf838b6f4a2da0c492f897137b4932ef0
parent 053f016e3b8328f6de0288f918c4615b8ba673b1

Check current tab before making active

      Bug: 5202966

Change-Id: I62fc806176d178193c4a9f0b658efa45b4d96584

src/com/android/browser/BaseUi.java

diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 3b8ecc6..7d7fda1 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -159,7 +159,10 @@
         mActivityPaused = false;
         // check if we exited without setting active tab
         // b: 5188145
-        setActiveTab(mTabControl.getCurrentTab());
+        final Tab ct = mTabControl.getCurrentTab();
+        if (ct != null) {
+            setActiveTab(ct);
+        }
     }
 
     protected boolean isActivityPaused() {