summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-08-24 14:19:18 -0700
committerMichael Kolb <kolby@google.com>2011-08-24 14:19:18 -0700
commit87357644efd5940876deb29820d3049bc9c6b13a (patch)
tree3e7ac2bb0f908caf75adb88938fa2b7dee8ebba8
parent1a4625a4fa1f3aae01de5cee5338ee4552edd3e8 (diff)
downloadandroid_packages_apps_Gello-87357644efd5940876deb29820d3049bc9c6b13a.tar.gz
android_packages_apps_Gello-87357644efd5940876deb29820d3049bc9c6b13a.tar.bz2
android_packages_apps_Gello-87357644efd5940876deb29820d3049bc9c6b13a.zip
Drop active tab check when blocking events
Bug: 5198309 The active tab check was freezing the browser Change-Id: I3376c84bb178c02d02deb54bf23fa1149809963d
-rw-r--r--src/com/android/browser/Controller.java19
1 files changed, 5 insertions, 14 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 386c483b..7192f3f3 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -2674,32 +2674,23 @@ public class Controller
}
public boolean dispatchKeyEvent(KeyEvent event) {
- return mBlockEvents || hasNoActiveTab();
+ return mBlockEvents;
}
public boolean dispatchKeyShortcutEvent(KeyEvent event) {
- return mBlockEvents || hasNoActiveTab();
+ return mBlockEvents;
}
public boolean dispatchTouchEvent(MotionEvent ev) {
- return mBlockEvents || hasNoActiveTab();
+ return mBlockEvents;
}
public boolean dispatchTrackballEvent(MotionEvent ev) {
- return mBlockEvents || hasNoActiveTab();
+ return mBlockEvents;
}
public boolean dispatchGenericMotionEvent(MotionEvent ev) {
- return mBlockEvents || hasNoActiveTab();
- }
-
- private boolean hasNoActiveTab() {
- Tab tab = getCurrentTab();
- if (tab == null) {
- Log.w(LOGTAG, "Received event with no active tab. Tab count: "
- + mTabControl.getTabCount());
- }
- return tab == null;
+ return mBlockEvents;
}
}