Skip to content

Commit c7ee3ca

Browse files
Romain GuyJamie Gennis
authored andcommitted
Remove dangerous and useless optimization
Bug #5525888 Change-Id: I553828c0da09b15d0dce3727e4c26a9d0bcf72ea
1 parent 720efc4 commit c7ee3ca

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

core/java/android/view/ViewGroup.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2719,13 +2719,6 @@ protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
27192719
return more;
27202720
}
27212721

2722-
float alpha = child.getAlpha();
2723-
// Bail out early if the view does not need to be drawn
2724-
if (alpha <= ViewConfiguration.ALPHA_THRESHOLD && (child.mPrivateFlags & ALPHA_SET) == 0 &&
2725-
!(child instanceof SurfaceView)) {
2726-
return more;
2727-
}
2728-
27292722
if (hardwareAccelerated) {
27302723
// Clear INVALIDATED flag to allow invalidation to occur during rendering, but
27312724
// retain the flag's value temporarily in the mRecreateDisplayList flag
@@ -2779,6 +2772,7 @@ protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
27792772
}
27802773
}
27812774

2775+
float alpha = child.getAlpha();
27822776
if (transformToApply != null || alpha < 1.0f || !child.hasIdentityMatrix()) {
27832777
if (transformToApply != null || !childHasIdentityMatrix) {
27842778
int transX = 0;

0 commit comments

Comments
 (0)