Merge "Active window not correctly computed."

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

@@ -3176,8 +3176,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
                     // The active window also determined events from which
                     // windows are delivered.
                     synchronized (mLock) {
+                        mFocusedWindowId = getFocusedWindowId();
                         if (mWindowsForAccessibilityCallback == null
-                                && windowId == getFocusedWindowId()) {
+                                && windowId == mFocusedWindowId) {
                             mActiveWindowId = windowId;
                         }
                     }