Merge "Remove ae_back_stack_restore flag" into main (e32eb03b) · Commits · e / os / android_frameworks_base

core/java/android/window/TaskFragmentOrganizer.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -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());
		}

+0 −8

Original line number	Diff line number	Diff line
		@@ -89,14 +89,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"

+1 −4

Original line number	Diff line number	Diff line
		@@ -85,11 +85,8 @@ class WindowExtensionsImpl implements WindowExtensions {
		if (Flags.wlinfoOncreate()) {
		return EXTENSIONS_VERSION_V9;
		}
		if (Flags.aeBackStackRestore()) {
		return EXTENSIONS_VERSION_V8;
		}
		return EXTENSIONS_VERSION_V7;
		}

		private String generateLogMessage() {
		final StringBuilder logBuilder = new StringBuilder("Initializing Window Extensions, "

+1 −5

Original line number	Diff line number	Diff line
		@@ -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);
		}

+2 −6

Original line number	Diff line number	Diff line
		@@ -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();
		}
		mBackupHelper = new BackupHelper(controller, this, outSavedState);
		if (!SplitController.ENABLE_SHELL_TRANSITIONS) {
		// TODO(b/207070762): cleanup with legacy app transition