From 7e361d22e3ceb7dac79acd1cf3567de86eb045bc Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Wed, 9 Oct 2013 17:20:43 -0700
Subject: [PATCH] Fix accessibility state callbacks

BUG: 11141708
Change-Id: Ieff1fb90c4f894eba3c203089dd61e1dabdb7982
---
 .../android/view/accessibility/AccessibilityManager.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java
index 2e8f1a291b16c..00f4adb911bcd 100644
--- a/core/java/android/view/accessibility/AccessibilityManager.java
+++ b/core/java/android/view/accessibility/AccessibilityManager.java
@@ -415,14 +415,18 @@ public final class AccessibilityManager {
         final boolean touchExplorationEnabled =
                 (stateFlags & STATE_FLAG_TOUCH_EXPLORATION_ENABLED) != 0;
         synchronized (mHandler) {
+            final boolean wasEnabled = mIsEnabled;
+            final boolean wasTouchExplorationEnabled = mIsTouchExplorationEnabled;
+
+            // Ensure listeners get current state from isZzzEnabled() calls.
             mIsEnabled = enabled;
             mIsTouchExplorationEnabled = touchExplorationEnabled;
 
-            if (enabled != mIsEnabled) {
+            if (wasEnabled != enabled) {
                 notifyAccessibilityStateChangedLh();
             }
 
-            if (touchExplorationEnabled != mIsTouchExplorationEnabled) {
+            if (wasTouchExplorationEnabled != touchExplorationEnabled) {
                 notifyTouchExplorationStateChangedLh();
             }
         }