From d660f73a42d0f8847d00d4b71407c881797f58ae Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 16 Oct 2020 16:31:45 -0700
Subject: Remove single task display path

Test: atest TaskStackChangedListenerTest
Test: atest RecentTasksTest
Bug: 165794879
Change-Id: I4c86e58026be7bcbbd8a2568b396a281668b9385
---
 core/java/android/window/VirtualDisplayTaskEmbedder.java | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'core/java/android/window/VirtualDisplayTaskEmbedder.java')

diff --git a/core/java/android/window/VirtualDisplayTaskEmbedder.java b/core/java/android/window/VirtualDisplayTaskEmbedder.java
index db27d6255de7..be5d55af5e8a 100644
--- a/core/java/android/window/VirtualDisplayTaskEmbedder.java
+++ b/core/java/android/window/VirtualDisplayTaskEmbedder.java
@@ -63,12 +63,10 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder {
 
     // For Virtual Displays
     private int mDisplayDensityDpi;
-    private final boolean mSingleTaskInstance;
     private final boolean mUsePublicVirtualDisplay;
     private final boolean mUseTrustedDisplay;
     private VirtualDisplay mVirtualDisplay;
     private Insets mForwardedInsets;
-    private DisplayMetrics mTmpDisplayMetrics;
     private TaskStackListener mTaskStackListener;
 
     /**
@@ -76,14 +74,10 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder {
      *
      * @param context the context
      * @param host the host for this embedded task
-     * @param singleTaskInstance whether to apply a single-task constraint to this container,
-     *                           only applicable if virtual displays are used
      */
     public VirtualDisplayTaskEmbedder(Context context, VirtualDisplayTaskEmbedder.Host host,
-            boolean singleTaskInstance, boolean usePublicVirtualDisplay,
-            boolean useTrustedDisplay) {
+            boolean usePublicVirtualDisplay, boolean useTrustedDisplay) {
         super(context, host);
-        mSingleTaskInstance = singleTaskInstance;
         mUsePublicVirtualDisplay = usePublicVirtualDisplay;
         mUseTrustedDisplay = useTrustedDisplay;
     }
@@ -128,10 +122,6 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder {
             WindowManagerGlobal.getWindowSession().reparentDisplayContent(
                     mHost.getWindow(), mSurfaceControl, displayId);
             wm.dontOverrideDisplayInfo(displayId);
-            if (mSingleTaskInstance) {
-                mContext.getSystemService(ActivityTaskManager.class)
-                        .setDisplayToSingleTaskInstance(displayId);
-            }
             setForwardedInsets(mForwardedInsets);
 
             mTaskStackListener = new TaskStackListenerImpl();
-- 
cgit v1.2.3