From f3a5c5892402916ca861c41319f21acb83bd1f83 Mon Sep 17 00:00:00 2001
From: Louis Chang <louischang@google.com>
Date: Fri, 5 May 2023 10:24:40 +0000
Subject: [PATCH] Unfreeze the surface when the transition is done

The surface was not unfreeze if the WindowContainer is closing and
changing after [1].

Always check and unfreeze the surface if needed when the transition
is done.

[1] d19ad2aa09fd27ec11e626ab239babb929c32fd6

Bug: 280754787
Test: click web link on chat while having a Meet call
Change-Id: I98618477a828eb72b2173af6988e804471139e81
---
 services/core/java/com/android/server/wm/WindowContainer.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java
index 02d3af6da326e..6ec08dc08c517 100644
--- a/services/core/java/com/android/server/wm/WindowContainer.java
+++ b/services/core/java/com/android/server/wm/WindowContainer.java
@@ -1396,6 +1396,9 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
     }
 
     void onAppTransitionDone() {
+        if (mSurfaceFreezer.hasLeash()) {
+            mSurfaceFreezer.unfreeze(getSyncTransaction());
+        }
         for (int i = mChildren.size() - 1; i >= 0; --i) {
             final WindowContainer wc = mChildren.get(i);
             wc.onAppTransitionDone();