Merge "Notification for changed subtree in accessibility mode not fired properly."

1 files changed, 5 insertions, 6 deletions

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 163343b86160..60d8a75c749c 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -6398,12 +6398,10 @@ public final class ViewRootImpl implements ViewParent,
 
         public void run() {
             mLastEventTimeMillis = SystemClock.uptimeMillis();
-            if (AccessibilityManager.getInstance(mContext).isEnabled()) {
-                AccessibilityEvent event = AccessibilityEvent.obtain();
-                event.setEventType(AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED);
-                event.setContentChangeType(AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE);
-                mSource.sendAccessibilityEventUnchecked(event);
-            }
+            AccessibilityEvent event = AccessibilityEvent.obtain();
+            event.setEventType(AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED);
+            event.setContentChangeType(AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE);
+            mSource.sendAccessibilityEventUnchecked(event);
             mSource.resetSubtreeAccessibilityStateChanged();
             mSource = null;
         }
@@ -6418,6 +6416,7 @@ public final class ViewRootImpl implements ViewParent,
             final long minEventIntevalMillis =
                     ViewConfiguration.getSendRecurringAccessibilityEventsInterval();
             if (timeSinceLastMillis >= minEventIntevalMillis) {
+                mSource.removeCallbacks(this);
                 run();
             } else {
                 mSource.postDelayed(this, minEventIntevalMillis - timeSinceLastMillis);