summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2014-04-09 23:48:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-04-09 23:48:41 +0000
commitbc1a8f42d9eb5f1d91c872904a9a283781291fcb (patch)
tree8e7b73739be4f9d8d2d35fec2d79208ffeabd794 /services
parent8e1f918738abf70a4dc86dbb12b386a9deea37f8 (diff)
parent48eacec53e3f877712c2cf66676f453ddf6b90fb (diff)
downloadframeworks_base-bc1a8f42d9eb5f1d91c872904a9a283781291fcb.zip
frameworks_base-bc1a8f42d9eb5f1d91c872904a9a283781291fcb.tar.gz
frameworks_base-bc1a8f42d9eb5f1d91c872904a9a283781291fcb.tar.bz2
Merge "Active window not correctly computed."
Diffstat (limited to 'services')
-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 35f873e..c3db55e 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/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;
}
}