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

Merge "Prevent crash when invalidating all Views Bug #7165793" into jb-mr1-dev

Browse Source
This commit is contained in:
Romain Guy
2012-09-13 22:53:12 -07:00
committed by Android (Google) Code Review
parent cd6e7e1b5c f84208faf8
commit 51d71003e4
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/view/ViewRootImpl.java
View File

@@ -832,8 +832,8 @@ public final class ViewRootImpl implements ViewParent,
void invalidateWorld(View view) {
view.invalidate();
if (view instanceof ViewGroup) {
ViewGroup parent = (ViewGroup)view;
for (int i=0; i<parent.getChildCount(); i++) {
ViewGroup parent = (ViewGroup) view;
for (int i = 0; i < parent.getChildCount(); i++) {
invalidateWorld(parent.getChildAt(i));
}
}
@@ -2998,7 +2998,9 @@ public final class ViewRootImpl implements ViewParent,
handleDispatchDoneAnimating();
} break;
case MSG_INVALIDATE_WORLD: {
invalidateWorld(mView);
if (mView != null) {
invalidateWorld(mView);
}
} break;
}
}