Merge "Prevent addtional removeSurface calls" into sc-dev

2021-04-22 07:41:49 +00:00
parent 00475ff23d 08f5b9c846
commit 3e0705d6e8
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/view/InsetsSourceConsumer.java
+++ b/core/java/android/view/InsetsSourceConsumer.java
@@ -184,7 +184,9 @@ public class InsetsSourceConsumer {
                if (oldLeash == null || newLeash == null || !oldLeash.isSameSurface(newLeash)) {
                    applyHiddenToControl();
                }
-                if (!requestedVisible && !mIsAnimationPending) {
+
+                // Remove the surface that owned by last control when it lost.
+                if (!requestedVisible && !mIsAnimationPending && lastControl == null) {
                    removeSurface();
                }
            }