summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-08-24 13:40:44 -0700
committerMichael Kolb <kolby@google.com>2011-08-24 13:40:44 -0700
commit1a4625a4fa1f3aae01de5cee5338ee4552edd3e8 (patch)
tree3efbf3edf838b6f4a2da0c492f897137b4932ef0 /src
parent053f016e3b8328f6de0288f918c4615b8ba673b1 (diff)
downloadpackages_apps_browser-1a4625a4fa1f3aae01de5cee5338ee4552edd3e8.zip
packages_apps_browser-1a4625a4fa1f3aae01de5cee5338ee4552edd3e8.tar.gz
packages_apps_browser-1a4625a4fa1f3aae01de5cee5338ee4552edd3e8.tar.bz2
Check current tab before making active
Bug: 5202966 Change-Id: I62fc806176d178193c4a9f0b658efa45b4d96584
Diffstat (limited to 'src')
-rw-r--r--src/com/android/browser/BaseUi.java5
1 files changed, 4 insertions, 1 deletions
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 @@ public abstract class BaseUi implements UI {
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() {