From 4bf251ca4ea094052ecb88ad053dc678655f8903 Mon Sep 17 00:00:00 2001 From: chaviw Date: Thu, 25 Jun 2020 09:12:55 -0700 Subject: [PATCH] Remove mEnterAnimationPending check for accessibility Accessibility was relying on WS.mEnterAnimationPending to determine if a window was ready on screen. However, that variable no longer represents what it used to and it doesn't actually mean the app is animating. The variable is only set when a relayout is requested and then unset when show is called. Accessibility is already checking isOnScreen and isVisibleLw so that should cover the cases to check if the window is ready. mEnterAnimationPending is not always set properly and causes issues with accessibility, which is the only place currently using it. Fixes: 152537982 Test: Magnification for Accessibility works Change-Id: Ib0f37b3cc6d744fd84f466a65e6ce006e07e116e --- .../java/com/android/server/wm/AccessibilityController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java index b9240c78d7117..9bc702d4c094e 100644 --- a/services/core/java/com/android/server/wm/AccessibilityController.java +++ b/services/core/java/com/android/server/wm/AccessibilityController.java @@ -855,8 +855,7 @@ final class AccessibilityController { mTempLayer = 0; mDisplayContent.forAllWindows((w) -> { if (w.isOnScreen() && w.isVisibleLw() - && (w.mAttrs.alpha != 0) - && !w.mWinAnimator.mEnterAnimationPending) { + && (w.mAttrs.alpha != 0)) { mTempLayer++; outWindows.put(mTempLayer, w); }