Remove ae_back_stack_restore flag

Bug: 289875940
Test: wm presubmit
Flag: EXEMPT remove flag
Change-Id: I520da573074d3a1657215203e391b8efa4847945

6 files changed, 4 insertions, 31 deletions

diff --git a/core/java/android/window/TaskFragmentOrganizer.java b/core/java/android/window/TaskFragmentOrganizer.java
index c316800108bd..0b9d62983004 100644
--- a/core/java/android/window/TaskFragmentOrganizer.java
+++ b/core/java/android/window/TaskFragmentOrganizer.java
@@ -279,10 +279,6 @@ public class TaskFragmentOrganizer extends WindowOrganizer {
      * @param state the state to save.
      */
     public void setSavedState(@NonNull Bundle state) {
-        if (!Flags.aeBackStackRestore()) {
-            return;
-        }
-
         if (state.getSize() > 200000) {
             throw new IllegalArgumentException("Saved state too large, " + state.getSize());
         }
diff --git a/core/java/android/window/flags/windowing_sdk.aconfig b/core/java/android/window/flags/windowing_sdk.aconfig
index 1b946afd506c..8f893c835d2d 100644
--- a/core/java/android/window/flags/windowing_sdk.aconfig
+++ b/core/java/android/window/flags/windowing_sdk.aconfig
@@ -91,14 +91,6 @@ flag {
 
 flag {
     namespace: "windowing_sdk"
-    name: "ae_back_stack_restore"
-    description: "Allow the ActivityEmbedding back stack to be restored after process restarted"
-    bug: "289875940"
-    is_fixed_read_only: true
-}
-
-flag {
-    namespace: "windowing_sdk"
     name: "touch_pass_through_opt_in"
     description: "Requires apps to opt-in to overlay pass through touches and provide APIs to opt-in"
     bug: "358129114"
diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java
index fcf3a3759f7a..de3146e5bd11 100644
--- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java
+++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java
@@ -85,10 +85,7 @@ class WindowExtensionsImpl implements WindowExtensions {
         if (Flags.wlinfoOncreate()) {
             return EXTENSIONS_VERSION_V9;
         }
-        if (Flags.aeBackStackRestore()) {
-            return EXTENSIONS_VERSION_V8;
-        }
-        return EXTENSIONS_VERSION_V7;
+        return EXTENSIONS_VERSION_V8;
     }
 
     private String generateLogMessage() {
diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java
index 1bcb0bb91515..b0fadb06b7e3 100644
--- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java
+++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java
@@ -288,7 +288,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
             mSplitRules.clear();
             mSplitRules.addAll(rules);
 
-            if (!Flags.aeBackStackRestore() || !mPresenter.isWaitingToRebuildTaskContainers()) {
+            if (!mPresenter.isWaitingToRebuildTaskContainers()) {
                 return;
             }
 
@@ -2893,10 +2893,6 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
 
     @Override
     public void setAutoSaveEmbeddingState(boolean saveEmbeddingState) {
-        if (!Flags.aeBackStackRestore()) {
-            return;
-        }
-
         synchronized (mLock) {
             mPresenter.setAutoSaveEmbeddingState(saveEmbeddingState);
         }
diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java
index 9a2f32e9ee99..eb59d6efdeff 100644
--- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java
+++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java
@@ -169,12 +169,8 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer {
         mWindowLayoutComponent = windowLayoutComponent;
         mController = controller;
         final Bundle outSavedState = new Bundle();
-        if (Flags.aeBackStackRestore()) {
-            outSavedState.setClassLoader(ParcelableTaskContainerData.class.getClassLoader());
-            registerOrganizer(false /* isSystemOrganizer */, outSavedState);
-        } else {
-            registerOrganizer();
-        }
+        outSavedState.setClassLoader(ParcelableTaskContainerData.class.getClassLoader());
+        registerOrganizer(false /* isSystemOrganizer */, outSavedState);
         mBackupHelper = new BackupHelper(controller, this, outSavedState);
         if (!SplitController.ENABLE_SHELL_TRANSITIONS) {
             // TODO(b/207070762): cleanup with legacy app transition
diff --git a/services/core/java/com/android/server/wm/TaskFragmentOrganizerController.java b/services/core/java/com/android/server/wm/TaskFragmentOrganizerController.java
index aaae160084a9..e63107cdc720 100644
--- a/services/core/java/com/android/server/wm/TaskFragmentOrganizerController.java
+++ b/services/core/java/com/android/server/wm/TaskFragmentOrganizerController.java
@@ -570,10 +570,6 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr
 
     private boolean restoreFromCachedStateIfPossible(@NonNull ITaskFragmentOrganizer organizer,
             int pid, int uid, @NonNull Bundle outSavedState) {
-        if (!Flags.aeBackStackRestore()) {
-            return false;
-        }
-
         TaskFragmentOrganizerState cachedState = null;
         int i = mCachedTaskFragmentOrganizerStates.size() - 1;
         for (; i >= 0; i--) {