Fix black screen bug

    Bug: 5180937
    attach a tab when fast exiting the navscreen

Change-Id: I3ecf248ac6073dfff6a134e5323052150c4efed1

1 files changed, 10 insertions, 0 deletions

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 009989bc..f5a76b92 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -334,12 +334,22 @@ public class PhoneUi extends BaseUi {
         if (mNavScreen == null) return;
         final Tab tab = mNavScreen.getSelectedTab();
         if ((tab == null) || !animate) {
+            if (tab != null) {
+                setActiveTab(tab);
+            } else if (mTabControl.getTabCount() > 0) {
+                // use a fallback tab
+                setActiveTab(mTabControl.getCurrentTab());
+            }
             mContentView.setVisibility(View.VISIBLE);
             finishAnimateOut();
             return;
         }
         NavTabView tabview = (NavTabView) mNavScreen.getSelectedTabView();
         if (tabview == null) {
+            if (mTabControl.getTabCount() > 0) {
+                // use a fallback tab
+                setActiveTab(mTabControl.getCurrentTab());
+            }
             mContentView.setVisibility(View.VISIBLE);
             finishAnimateOut();
             return;