Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2726eb62 authored by lumark's avatar lumark
Browse files

Fix CtsAccessibilityServiceTestCases Fail 

CL [1] introduced window transition state didn't callback to AccessibilityController
when window type is TYPE_BASE_APPLICATION, caused some tests failed.

We should deliver the transition state to controller for any window type.

[1]: Ibeac1e513023ab19bcfb7ee412f41a570e917a17

Fix: 135581807
Bug: 133274628

Test: atest MagnificationGestureHandlerTest AccessibilityGestureDispatchTest
Change-Id: I94af40d860fb3ede21534f902d4b83f7e1b06181
parent fefd66a5

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

+7 −7
Original line number Diff line number Diff line
@@ -1296,12 +1296,6 @@ class WindowStateAnimator { 
            return;

        }



        // We don't apply animation for application main window here since this window type

        // should be controlled by AppWindowToken in general.

        if (mAttrType == TYPE_BASE_APPLICATION) {

            return;

        }



        final int transit;

        if (mEnterAnimationPending) {

            mEnterAnimationPending = false;
@@ -1309,7 +1303,13 @@ class WindowStateAnimator { 
        } else {

            transit = WindowManagerPolicy.TRANSIT_SHOW;

        }



        // We don't apply animation for application main window here since this window type

        // should be controlled by AppWindowToken in general.

        if (mAttrType != TYPE_BASE_APPLICATION) {

            applyAnimationLocked(transit, true);

        }



        if (mService.mAccessibilityController != null) {

            mService.mAccessibilityController.onWindowTransitionLocked(mWin, transit);

        }