summaryrefslogtreecommitdiffstats
path: root/services/accessibility
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2014-04-09 23:51:12 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-09 23:51:12 +0000
commit6360d29cd78839539aafed961a0b96dc7ba3c317 (patch)
tree35793956aeacae383069847a6599c3a0e5ed9797 /services/accessibility
parent615c946448d9afb08a0cce0eeabc4a9d775f402e (diff)
parentbc1a8f42d9eb5f1d91c872904a9a283781291fcb (diff)
downloadframeworks_base-6360d29cd78839539aafed961a0b96dc7ba3c317.zip
frameworks_base-6360d29cd78839539aafed961a0b96dc7ba3c317.tar.gz
frameworks_base-6360d29cd78839539aafed961a0b96dc7ba3c317.tar.bz2
am bc1a8f42: Merge "Active window not correctly computed."
* commit 'bc1a8f42d9eb5f1d91c872904a9a283781291fcb': Active window not correctly computed.
Diffstat (limited to 'services/accessibility')
-rw-r--r--services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java3
1 files changed, 2 insertions, 1 deletions
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 @@ 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;
}
}