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 automerge: e6e216c

Browse Source 
automerge: 2aacb86

* commit '2aacb861f4c7b80c5d2bb22956c9a5d4ace4df67':
  Avoid ripple buffer creation for empty bounds
This commit is contained in:
Alan Viverette
2015-01-21 21:13:33 +00:00
committed by android-build-merger
parent 767cddd3dd 2aacb861f4
commit 8ac90a0609
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

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