commit c649d9d8ca574885f87e34f277af53567787b3ac
author Vishnu Nair <vishnun@google.com> Thu Mar 05 14:40:27 2020 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Thu Mar 05 23:57:30 2020 +0000
tree acb863ad96570727c17e6eace801ad6d2d0c7ec0
parent da58015335c85c45dba5e20f082af4b66af2647f

Change animation-leash to be a container layer

Temporary revert to fix flicker issues.

Bug: b/149792636, b/150829791
Test: go/wm-smoke
Change-Id: I016dfd937ea844f0687195d1670471dfdcbd8cdd
(cherry picked from commit 10a09f5eaff9f7e75879e8be952b1fc80635ce57)

services/core/java/com/android/server/wm/SurfaceAnimator.java

diff --git a/services/core/java/com/android/server/wm/SurfaceAnimator.java b/services/core/java/com/android/server/wm/SurfaceAnimator.java
index 3b3234a..19f8ca9 100644
--- a/services/core/java/com/android/server/wm/SurfaceAnimator.java
+++ b/services/core/java/com/android/server/wm/SurfaceAnimator.java
@@ -379,10 +379,8 @@
         final SurfaceControl.Builder builder = animatable.makeAnimationLeash()
                 .setParent(animatable.getAnimationLeashParent())
                 .setHidden(hidden)
-                .setName(surface + " - animation-leash")
-                .setColorLayer();
+                .setName(surface + " - animation-leash");
         final SurfaceControl leash = builder.build();
-        t.unsetColor(leash);
         t.setWindowCrop(leash, width, height);
         t.setPosition(leash, x, y);
         t.show(leash);