Merge "Fixing crash in ViewGroup.dispatchPopulateAccessibilityEvent" into jb-dev

sganov · Android (Google) Code Review · commit 10890607f88e · 2012-04-30T12:39:25.000-07:00
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
@@ -2438,7 +2438,6 @@ boolean dispatchPopulateAccessibilityEventInternal(AccessibilityEvent event) {
                 if ((child.mViewFlags & VISIBILITY_MASK) == VISIBLE) {
                     handled = child.dispatchPopulateAccessibilityEvent(event);
                     if (handled) {
-                        children.recycle();
                         return handled;
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -2438,7 +2438,6 @@ boolean dispatchPopulateAccessibilityEventInternal(AccessibilityEvent event) {`
`2438`	`2438`	`if ((child.mViewFlags & VISIBILITY_MASK) == VISIBLE) {`
`2439`	`2439`	`handled = child.dispatchPopulateAccessibilityEvent(event);`
`2440`	`2440`	`if (handled) {`
`2441`		`- children.recycle();`
`2442`	`2441`	`return handled;`
`2443`	`2442`	`}`
`2444`	`2443`	`}`