diff options
| author | Sagar Dhawan <sdhawan@codeaurora.org> | 2015-02-06 15:47:20 -0800 |
|---|---|---|
| committer | WebTech Code Review <code-review@localhost> | 2015-02-11 14:44:45 -0800 |
| commit | f7b5d0be6e9622443c46b7851ffdaff830789ad1 (patch) | |
| tree | 30d82805e5875e2b20d57a5c5aec621e6dc0946f /src/com/android/browser/Controller.java | |
| parent | 01493f68187b7402bb3207126e3036182ce1d22b (diff) | |
| download | android_packages_apps_Gello-f7b5d0be6e9622443c46b7851ffdaff830789ad1.tar.gz android_packages_apps_Gello-f7b5d0be6e9622443c46b7851ffdaff830789ad1.tar.bz2 android_packages_apps_Gello-f7b5d0be6e9622443c46b7851ffdaff830789ad1.zip | |
Fix for BlackScreen Bug
Cancel request to go to the NavScreen
and discard callback if tab state changes.
Change-Id: I3b29023c10c2a3821f36a43e465df27d663c0825
Diffstat (limited to 'src/com/android/browser/Controller.java')
| -rw-r--r-- | src/com/android/browser/Controller.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java index 6b5e4240..dd3d76c9 100644 --- a/src/com/android/browser/Controller.java +++ b/src/com/android/browser/Controller.java @@ -2874,9 +2874,14 @@ public class Controller public void setActiveTab(Tab tab) { // monkey protection against delayed start if (tab != null) { + + //Not going to the Nav Screen AnyMore. Unless NavScreen is already showing. + mUi.cancelNavScreenRequest(); mTabControl.setCurrentTab(tab); // the tab is guaranteed to have a webview after setCurrentTab mUi.setActiveTab(tab); + + tab.setTimeStamp(); //Purge active tabs MemoryMonitor.purgeActiveTabs(mActivity.getApplicationContext(), this, mSettings); @@ -2892,6 +2897,8 @@ public class Controller } protected void reuseTab(Tab appTab, UrlData urlData) { + //Cancel navscreen request + mUi.cancelNavScreenRequest(); // Dismiss the subwindow if applicable. dismissSubWindow(appTab); // Since we might kill the WebView, remove it from the |