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

Merge "Adding more logging for bug: 6499508" into jb-dev

Browse Source
This commit is contained in:
Michael Jurka
2012-06-05 08:57:40 -07:00
committed by Android (Google) Code Review
parent 72d6835c7c a9265805dc
commit da741b4f24
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java
View File

@@ -75,6 +75,9 @@ public class RecentsVerticalScrollView extends ScrollView
} }
private void addToRecycledViews(View v) { private void addToRecycledViews(View v) {
if (mRecycledViews.contains(v)) {
throw new RuntimeException("Child was already recycled");
}
if (mRecycledViews.size() < mNumItemsInOneScreenful) { if (mRecycledViews.size() < mNumItemsInOneScreenful) {
mRecycledViews.add(v); mRecycledViews.add(v);
} }
@@ -104,12 +107,11 @@ public class RecentsVerticalScrollView extends ScrollView
if (mRecycledViews.size() != 0) { if (mRecycledViews.size() != 0) {
old = mRecycledViews.remove(mRecycledViews.size() - 1); old = mRecycledViews.remove(mRecycledViews.size() - 1);
old.setVisibility(VISIBLE); old.setVisibility(VISIBLE);
if (old.getParent() != null) {
throw new RuntimeException("Recycled child has parent (i: " + i + ", recycled i: " + mRecycledViews.size());
}
} }
final View view = mAdapter.getView(i, old, mLinearLayout); final View view = mAdapter.getView(i, old, mLinearLayout);
if (view.getParent() != null) {
throw new RuntimeException("Recycled child has parent");
}
if (mPerformanceHelper != null) { if (mPerformanceHelper != null) {
mPerformanceHelper.addViewCallback(view); mPerformanceHelper.addViewCallback(view);