From 4ba3e83428d5b5468d0e4ea20b08c5e693bef9ea Mon Sep 17 00:00:00 2001
From: Wale Ogunwale <ogunwale@google.com>
Date: Thu, 20 Apr 2017 16:45:13 -0700
Subject: [PATCH] Ignore request to add starting window if already visible

No need to display a starting winow for an app that already has its
main window visible and drawn.

Test: manual
Change-Id: Ibb6c74d0c5cc91cef335749d7546001fff1f7678
Fixes: 37199644
---
 .../java/com/android/server/wm/AppWindowContainerController.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/services/core/java/com/android/server/wm/AppWindowContainerController.java b/services/core/java/com/android/server/wm/AppWindowContainerController.java
index bde2111217f1..292734db74a8 100644
--- a/services/core/java/com/android/server/wm/AppWindowContainerController.java
+++ b/services/core/java/com/android/server/wm/AppWindowContainerController.java
@@ -470,6 +470,13 @@ public class AppWindowContainerController
                 return false;
             }
 
+            final WindowState mainWin = mContainer.findMainWindow();
+            if (mainWin != null && mainWin.isVisible() && mainWin.isDrawnLw()) {
+                // App already has a visible window that is drawn...why would you want a starting
+                // window?
+                return false;
+            }
+
             final int type = getStartingWindowType(newTask, taskSwitch, processRunning,
                     allowTaskSnapshot);
 
-- 
2.11.0