Merge "Allow multiple adjacent TFs (8/n)" into main

1 files changed, 4 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/wm/TaskFragment.java b/services/core/java/com/android/server/wm/TaskFragment.java
index 7b7b3eb17ddd..367adc355738 100644
--- a/services/core/java/com/android/server/wm/TaskFragment.java
+++ b/services/core/java/com/android/server/wm/TaskFragment.java
@@ -518,11 +518,14 @@ class TaskFragment extends WindowContainer<WindowContainer> {
         }
     }
 
-    // TODO(b/373709676): update usages.
     /** @deprecated b/373709676 replace with {@link #getAdjacentTaskFragments()}. */
     @Deprecated
     @Nullable
     TaskFragment getAdjacentTaskFragment() {
+        if (Flags.allowMultipleAdjacentTaskFragments()) {
+            throw new IllegalStateException("allowMultipleAdjacentTaskFragments is enabled. "
+                    + "Use #getAdjacentTaskFragments instead");
+        }
         return mAdjacentTaskFragment;
     }