Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix View leakage from mPreSortedChildren" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-04 22:23:23 +00:00
committed by Android (Google) Code Review
parent ecf4622618 fc56377178
commit 4e34cd0537
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/view/ViewGroup.java
View File

@@ -1718,11 +1718,13 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
if (isTransformedTouchPointInView(x, y, child, point)) { if (isTransformedTouchPointInView(x, y, child, point)) {
final PointerIcon pointerIcon = child.getPointerIcon(event, point.x, point.y); final PointerIcon pointerIcon = child.getPointerIcon(event, point.x, point.y);
if (pointerIcon != null) { if (pointerIcon != null) {
if (preorderedList != null) preorderedList.clear();
return pointerIcon; return pointerIcon;
} }
break; break;
} }
} }
if (preorderedList != null) preorderedList.clear();
} }
// The pointer is not a child or the child has no preferences, returning the default // The pointer is not a child or the child has no preferences, returning the default
@@ -3028,6 +3030,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
final ViewStructure cstructure = structure.newChild(i); final ViewStructure cstructure = structure.newChild(i);
child.dispatchProvideStructure(cstructure); child.dispatchProvideStructure(cstructure);
} }
if (preorderedList != null) preorderedList.clear();
} }
} }
} }
@@ -3619,6 +3622,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
if (mPreSortedChildren == null) { if (mPreSortedChildren == null) {
mPreSortedChildren = new ArrayList<>(childrenCount); mPreSortedChildren = new ArrayList<>(childrenCount);
} else { } else {
// callers should clear, so clear shouldn't be necessary, but for safety...
mPreSortedChildren.clear();
mPreSortedChildren.ensureCapacity(childrenCount); mPreSortedChildren.ensureCapacity(childrenCount);
} }