diff options
| author | Svetoslav <svetoslavganov@google.com> | 2013-10-09 11:00:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-09 11:00:42 -0700 |
| commit | fdcd50f13d961514ed1a47573b627b6b3184c1fc (patch) | |
| tree | 27e12fc010cf6d4b27e428ffa6d172c2e9b32d54 /core/java/android/view/accessibility | |
| parent | cb8c4501d47ac492d48fbdd3b8e599fe620f2949 (diff) | |
| parent | 53f16ba2b24d6045b880923632cbddd6bee4cd3c (diff) | |
| download | frameworks_base-fdcd50f13d961514ed1a47573b627b6b3184c1fc.zip frameworks_base-fdcd50f13d961514ed1a47573b627b6b3184c1fc.tar.gz frameworks_base-fdcd50f13d961514ed1a47573b627b6b3184c1fc.tar.bz2 | |
am 53f16ba2: am 0cc8276d: Merge "Add missing locking when updating the accessibility node info cache." into klp-dev
* commit '53f16ba2b24d6045b880923632cbddd6bee4cd3c':
Add missing locking when updating the accessibility node info cache.
Diffstat (limited to 'core/java/android/view/accessibility')
| -rw-r--r-- | core/java/android/view/accessibility/AccessibilityNodeInfoCache.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfoCache.java b/core/java/android/view/accessibility/AccessibilityNodeInfoCache.java index 6bef78e..7dd1e8a 100644 --- 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) { |