Merge "Add missing locking when updating the accessibility node info cache." into klp-dev

2013-10-09 17:55:15 +00:00
parent fcd8a39edb 3edcd8cfdf
commit 0cc8276d3a
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/view/accessibility/AccessibilityNodeInfoCache.java
+++ b/core/java/android/view/accessibility/AccessibilityNodeInfoCache.java
@@ -86,7 +86,9 @@ public class AccessibilityNodeInfoCache {
                    refreshCachedNode(event.getSourceNodeId());
                } break;
                case AccessibilityEvent.TYPE_VIEW_SCROLLED: {
-                    clearSubTreeLocked(event.getSourceNodeId());
+                    synchronized (mLock) {
+                        clearSubTreeLocked(event.getSourceNodeId());
+                    }
                } break;
                case AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED: {
                    synchronized (mLock) {