From 6ca6de89c0aaf3da2c255b5e1a48458103f626b6 Mon Sep 17 00:00:00 2001 From: Jerry Chang Date: Tue, 24 Aug 2021 04:48:55 +0000 Subject: [PATCH] Revert "Move/Launch task on the TaskView's display." This reverts commit 2cdc359b84c0a9c5fae396220cf8e2b46f8c6042. Reason for revert: this brokes split screen and result to device reboot. Bug: 197293995 Change-Id: I154287230fa3849cad1c0e337e3bf3fd826257a4 --- quickstep/src/com/android/quickstep/views/TaskView.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java index dbda9490ca..a3b9c6f453 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/src/com/android/quickstep/views/TaskView.java @@ -654,7 +654,6 @@ public class TaskView extends FrameLayout implements Reusable { TestLogging.recordEvent( TestProtocol.SEQUENCE_MAIN, "startActivityFromRecentsAsync", mTask); ActivityOptionsWrapper opts = mActivity.getActivityLaunchOptions(this, null); - opts.options.setLaunchDisplayId(getRootViewDisplayId()); if (ActivityManagerWrapper.getInstance() .startActivityFromRecents(mTask.key, opts.options)) { RecentsView recentsView = getRecentsView(); @@ -695,7 +694,6 @@ public class TaskView extends FrameLayout implements Reusable { // Indicate success once the system has indicated that the transition has started ActivityOptions opts = ActivityOptionsCompat.makeCustomAnimation( getContext(), 0, 0, () -> callback.accept(true), MAIN_EXECUTOR.getHandler()); - opts.setLaunchDisplayId(getRootViewDisplayId()); if (freezeTaskList) { ActivityOptionsCompat.setFreezeRecentTasksList(opts); } @@ -1507,10 +1505,6 @@ public class TaskView extends FrameLayout implements Reusable { mDigitalWellBeingToast.setBannerColorTint(tintColor, amount); } - private int getRootViewDisplayId() { - return getRootView().getDisplay().getDisplayId(); - } - /** * We update and subsequently draw these in {@link #setFullscreenProgress(float)}. */