From 9d1def8ca83122417cfc1eb8262504084f340a32 Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Mon, 14 Nov 2022 09:48:18 -0800
Subject: [PATCH] Make displayChange in existing transition just an error.

This doesn't need to crash the system. It should be an error,
though. Unfortunately, display-changes, currently are not
deferrable so we can't guarantee a unique transition.

Bug: 259004137
Test: systemui-foldable-smoke-suite
Change-Id: Iea946724fa949d731f05f1f975ffd8b338f78684
---
 .../core/java/com/android/server/wm/TransitionController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/TransitionController.java b/services/core/java/com/android/server/wm/TransitionController.java
index 37bef3a833ee9..25df5112e395f 100644
--- a/services/core/java/com/android/server/wm/TransitionController.java
+++ b/services/core/java/com/android/server/wm/TransitionController.java
@@ -423,7 +423,7 @@ class TransitionController {
         Transition newTransition = null;
         if (isCollecting()) {
             if (displayChange != null) {
-                throw new IllegalArgumentException("Provided displayChange for a non-new request");
+                Slog.e(TAG, "Provided displayChange for a non-new request", new Throwable());
             }
             // Make the collecting transition wait until this request is ready.
             mCollectingTransition.setReady(readyGroupRef, false);