diff options
| author | Svetoslav <svetoslavganov@google.com> | 2013-10-09 11:04:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-09 11:04:23 -0700 |
| commit | 67c8d20ed28e0b75de50fc8353a132b8404310b6 (patch) | |
| tree | d0ca609a2bf2b8297d28016c79432de1a0ade09e /core/java/android/view/accessibility | |
| parent | 69bfc60ae07e2eba94bf73098d3572bec725e208 (diff) | |
| parent | fdcd50f13d961514ed1a47573b627b6b3184c1fc (diff) | |
| download | frameworks_base-67c8d20ed28e0b75de50fc8353a132b8404310b6.zip frameworks_base-67c8d20ed28e0b75de50fc8353a132b8404310b6.tar.gz frameworks_base-67c8d20ed28e0b75de50fc8353a132b8404310b6.tar.bz2 | |
am fdcd50f1: am 53f16ba2: am 0cc8276d: Merge "Add missing locking when updating the accessibility node info cache." into klp-dev
* commit 'fdcd50f13d961514ed1a47573b627b6b3184c1fc':
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) { |