diff options
| author | Louis Chang <louischang@google.com> | 2023-05-05 10:24:40 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-14 02:44:28 +0000 |
| commit | b36bbbbe23ab94b2eb6584133fef6a7ecc552308 (patch) | |
| tree | 11064d15712539c4ddd7685a275e1cc73c9001d4 | |
| parent | b0aedab367d7381351e73f3bdb27bcb086f03df1 (diff) | |
| download | base-b36bbbbe23ab94b2eb6584133fef6a7ecc552308.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.java | 3 |
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(); |