commit eb0d3bc0ed685c1e479f95a16481dd9fd5d96f22
author Jorim Jaggi <jjaggi@google.com> Fri Dec 15 14:56:19 2017 +0100
committer Jorim Jaggi <jjaggi@google.com> Fri Dec 15 14:56:19 2017 +0100
tree ac4deee4be7f796afab1676b9957c3b384eade93
parent 313d7e003d493b6c412c42a612d3616068467d22

Fix accessibility window position information.

Since the position is now split up between WS and WSA, we need to
take both into account when calculating the window position.

Test: ViewTest, PermissionsHostTest, etc
Change-Id: I5d8396cee072316744cbb4a7e6585a820e808f60
Fixes: 70682698

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

diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java
index 95b139a..2bda80d 100644
--- a/services/core/java/com/android/server/wm/AccessibilityController.java
+++ b/services/core/java/com/android/server/wm/AccessibilityController.java
@@ -234,16 +234,7 @@
 
     private static void populateTransformationMatrixLocked(WindowState windowState,
             Matrix outMatrix) {
-        sTempFloats[Matrix.MSCALE_X] = windowState.mWinAnimator.mDsDx;
-        sTempFloats[Matrix.MSKEW_Y] = windowState.mWinAnimator.mDtDx;
-        sTempFloats[Matrix.MSKEW_X] = windowState.mWinAnimator.mDtDy;
-        sTempFloats[Matrix.MSCALE_Y] = windowState.mWinAnimator.mDsDy;
-        sTempFloats[Matrix.MTRANS_X] = windowState.mShownPosition.x;
-        sTempFloats[Matrix.MTRANS_Y] = windowState.mShownPosition.y;
-        sTempFloats[Matrix.MPERSP_0] = 0;
-        sTempFloats[Matrix.MPERSP_1] = 0;
-        sTempFloats[Matrix.MPERSP_2] = 1;
-        outMatrix.setValues(sTempFloats);
+        windowState.getTransformationMatrix(sTempFloats, outMatrix);
     }
 
     /**