Merge "Only persist task bounds for freeform tasks."

1 files changed, 2 insertions, 5 deletions

diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 81fe23c5aabe..c39ee7597db1 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -485,12 +485,9 @@ public class ActivityManager {
             return stackId == FREEFORM_WORKSPACE_STACK_ID;
         }
 
-        /**
-         * Returns true if the task bounds should persist across power cycles.
-         */
+        /** Returns true if the task bounds should persist across power cycles. */
         public static boolean persistTaskBounds(int stackId) {
-            return isStaticStack(stackId) &&
-                    stackId != DOCKED_STACK_ID && stackId != PINNED_STACK_ID;
+            return stackId == FREEFORM_WORKSPACE_STACK_ID;
         }
 
         /**