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

Avoid ripple buffer creation for empty bounds

Browse Source 
Bug: 19068439
Change-Id: I031d4303bbf101a25612dce6f02d81ce4cf58e2b
This commit is contained in:
Alan Viverette
2015-01-21 12:30:49 -08:00
parent 213269599b
commit b74155cf01
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/java/android/graphics/drawable/RippleDrawable.java
View File

@@ -661,7 +661,8 @@ public class RippleDrawable extends LayerDrawable {
mHasValidMask = true; mHasValidMask = true;
if (maskType == MASK_NONE) { final Rect bounds = getBounds();
if (maskType == MASK_NONE || bounds.isEmpty()) {
if (mMaskBuffer != null) { if (mMaskBuffer != null) {
mMaskBuffer.recycle(); mMaskBuffer.recycle();
mMaskBuffer = null; mMaskBuffer = null;
@@ -674,7 +675,6 @@ public class RippleDrawable extends LayerDrawable {
} }
// Ensure we have a correctly-sized buffer. // Ensure we have a correctly-sized buffer.
final Rect bounds = getBounds();
if (mMaskBuffer == null if (mMaskBuffer == null
|| mMaskBuffer.getWidth() != bounds.width() || mMaskBuffer.getWidth() != bounds.width()
|| mMaskBuffer.getHeight() != bounds.height()) { || mMaskBuffer.getHeight() != bounds.height()) {