Merge "Don't show starting window for overlay activities" into oc-dev

2017-04-19 20:36:36 +00:00
parent 3a427c3bd9 19866e2aae
commit 57d0c0bb43
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActivityRecord.java
+++ b/services/core/java/com/android/server/am/ActivityRecord.java
@@ -2130,6 +2130,11 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
        if (mWindowContainerController == null) {
            return;
        }
+        if (mTaskOverlay) {
+            // We don't show starting window for overlay activities.
+            return;
+        }
+
        final CompatibilityInfo compatInfo =
                service.compatibilityInfoForPackageLocked(info.applicationInfo);
        final boolean shown = mWindowContainerController.addStartingWindow(packageName, theme,