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

Avoid ripple buffer creation for empty bounds automerge: b74155c

Browse Source 
automerge: e6e216c

* commit 'e6e216c48ea25bdbc2d0a262c74670fb6513e42b':
  Avoid ripple buffer creation for empty bounds
This commit is contained in:
Alan Viverette
2015-01-21 21:09:39 +00:00
committed by android-build-merger
parent 52f25f7b30 e6e216c48e
commit 2aacb861f4
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()) {