commit 12179199816b6205a788e31ac8d38b96d6de53ad
author Sunny Goyal <sunnygoyal@google.com> Mon Aug 05 17:39:42 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 05 17:39:42 2019 -0700
tree 944c678d9b7bbdd0e4b73e4c37a9f260bc5817df
parent 347ce4529b5b7f682aa9f4959b17f2b52176ae67
parent bafd62971ab6d1a2c15c1baba21ea78074837368

Merge "Use task display id when starting split screen" into ub-launcher3-qt-r1-dev am: 6cf32a2e95
am: bafd62971a

Change-Id: I1b981e07329a0a6fc0667af58188c9ba047f068d

quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java

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 cfd14bb..1af0db0 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskSystemShortcut.java
@@ -205,8 +205,7 @@
                         }
                     };
                     WindowManagerWrapper.getInstance().overridePendingAppTransitionMultiThumbFuture(
-                            future, animStartedListener, mHandler, true /* scaleUp */,
-                            v.getDisplay().getDisplayId());
+                            future, animStartedListener, mHandler, true /* scaleUp */, displayId);
                 }
             });
         }