From 5aec768ff4bd7fcdc043346485ab6b1c512d95b4 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 17 May 2019 14:45:34 -0700
Subject: [PATCH] Fix issue with restored task display ids

- When tasks are restored, they don't have a valid display id yet,
  but they will still be started on the default display and should
  have the same options until proven otherwise.

Bug: 132892578
Change-Id: I8ba0a976bd5682fbcda72ca1a98bf2517eb31312
---
 .../src/com/android/quickstep/TaskSystemShortcut.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
index 2c919b3c17..213c5d3244 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
@@ -226,7 +226,7 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut
             // TODO(b/118266305): Temporarily disable splitscreen for secondary display while new
             // implementation is enabled
             return !activity.getDeviceProfile().isMultiWindowMode
-                    && displayId == DEFAULT_DISPLAY;
+                    && (displayId == -1 || displayId == DEFAULT_DISPLAY);
         }
 
         @Override