summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouis Chang <louischang@google.com>2023-05-05 10:24:40 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-05-09 04:04:24 +0000
commitf223bd540eab28e3b249a26709bf976ebf24c338 (patch)
tree08083a871ca4f47f179747b128bacd99cc28a399
parentb7a1853ee59ba95910a0df9da004ee35f6209b36 (diff)
downloadbase-f223bd540eab28e3b249a26709bf976ebf24c338.tar.gz
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 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f3a5c5892402916ca861c41319f21acb83bd1f83) Merged-In: I98618477a828eb72b2173af6988e804471139e81 Change-Id: I98618477a828eb72b2173af6988e804471139e81
-rw-r--r--services/core/java/com/android/server/wm/WindowContainer.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java
index 02d3af6da326..6ec08dc08c51 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();