Remove single task display path

Test: atest TaskStackChangedListenerTest
Test: atest RecentTasksTest
Bug: 165794879
Change-Id: I4c86e58026be7bcbbd8a2568b396a281668b9385

1 files changed, 9 insertions, 20 deletions

diff --git a/core/java/android/app/ActivityView.java b/core/java/android/app/ActivityView.java
index db95eae112b5..8c42a8a55bb1 100644
--- a/core/java/android/app/ActivityView.java
+++ b/core/java/android/app/ActivityView.java
@@ -85,8 +85,7 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd
     }
 
     public ActivityView(Context context, AttributeSet attrs) {
-        this(context, attrs, 0 /* defStyle */, false /* singleTaskInstance */,
-                false /* usePublicVirtualDisplay */,
+        this(context, attrs, 0 /* defStyle */, false /* usePublicVirtualDisplay */,
                 false /* disableSurfaceViewBackgroundLayer */, false /* useTrustedDisplay */);
     }
 
@@ -97,22 +96,21 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd
      */
     public ActivityView(
             @NonNull Context context, @NonNull AttributeSet attrs, int defStyle,
-            boolean singleTaskInstance, boolean usePublicVirtualDisplay) {
-        this(context, attrs, defStyle, singleTaskInstance, usePublicVirtualDisplay,
-                false /* disableSurfaceViewBackgroundLayer */,
-                false /* useTrustedDisplay */);
+            boolean usePublicVirtualDisplay) {
+        this(context, attrs, defStyle, usePublicVirtualDisplay,
+                false /* disableSurfaceViewBackgroundLayer */, false /* useTrustedDisplay */);
     }
 
     private ActivityView(
             @NonNull Context context, @NonNull AttributeSet attrs, int defStyle,
-            boolean singleTaskInstance, boolean usePublicVirtualDisplay,
-            boolean disableSurfaceViewBackgroundLayer, boolean useTrustedDisplay) {
+            boolean usePublicVirtualDisplay, boolean disableSurfaceViewBackgroundLayer,
+            boolean useTrustedDisplay) {
         super(context, attrs, defStyle);
         if (useTaskOrganizer()) {
             mTaskEmbedder = new TaskOrganizerTaskEmbedder(context, this);
         } else {
-            mTaskEmbedder = new VirtualDisplayTaskEmbedder(context, this, singleTaskInstance,
-                    usePublicVirtualDisplay, useTrustedDisplay);
+            mTaskEmbedder = new VirtualDisplayTaskEmbedder(context, this, usePublicVirtualDisplay,
+                    useTrustedDisplay);
         }
         mSurfaceView = new SurfaceView(context, null, 0, 0, disableSurfaceViewBackgroundLayer);
         // Since ActivityView#getAlpha has been overridden, we should use parent class's alpha
@@ -641,7 +639,6 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd
         private final Context mContext;
         private AttributeSet mAttrs;
         private int mDefStyle;
-        private boolean mSingleInstance;
         private boolean mUsePublicVirtualDisplay;
         private boolean mDisableSurfaceViewBackgroundLayer;
         private boolean mUseTrustedDisplay;
@@ -650,7 +647,6 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd
             mContext = context;
             mAttrs = null;
             mDefStyle = 0;
-            mSingleInstance = false;
             mUsePublicVirtualDisplay = false;
             mDisableSurfaceViewBackgroundLayer = false;
             mUseTrustedDisplay = false;
@@ -676,13 +672,6 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd
             return this;
         }
 
-        /** Sets to {@code true} to make the {@link ActivityView} single instance. */
-        @NonNull
-        public Builder setSingleInstance(boolean singleInstance) {
-            mSingleInstance = singleInstance;
-            return this;
-        }
-
         /**
          * Sets to {@code true} to use public virtual display for the {@link ActivityView}.
          * <p>
@@ -722,7 +711,7 @@ public class ActivityView extends ViewGroup implements android.window.TaskEmbedd
         /** Creates an {@link ActivityView} */
         @NonNull
         public ActivityView build() {
-            return new ActivityView(mContext, mAttrs, mDefStyle, mSingleInstance,
+            return new ActivityView(mContext, mAttrs, mDefStyle,
                     mUsePublicVirtualDisplay, mDisableSurfaceViewBackgroundLayer,
                     mUseTrustedDisplay);
         }