commit 6360d29cd78839539aafed961a0b96dc7ba3c317
author Svetoslav <svetoslavganov@google.com> Wed Apr 09 23:51:12 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 09 23:51:12 2014 +0000
tree 35793956aeacae383069847a6599c3a0e5ed9797
parent 615c946448d9afb08a0cce0eeabc4a9d775f402e
parent bc1a8f42d9eb5f1d91c872904a9a283781291fcb

am bc1a8f42: Merge "Active window not correctly computed."

* commit 'bc1a8f42d9eb5f1d91c872904a9a283781291fcb':
  Active window not correctly computed.

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

diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index a72965d..7aa07a4 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -3175,8 +3175,9 @@
                     // The active window also determined events from which
                     // windows are delivered.
                     synchronized (mLock) {
+                        mFocusedWindowId = getFocusedWindowId();
                         if (mWindowsForAccessibilityCallback == null
-                                && windowId == getFocusedWindowId()) {
+                                && windowId == mFocusedWindowId) {
                             mActiveWindowId = windowId;
                         }
                     }