commit 2aacb861f4c7b80c5d2bb22956c9a5d4ace4df67
author Alan Viverette <alanv@google.com> Wed Jan 21 21:09:39 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 21 21:09:39 2015 +0000
tree b05e6151c407ec450309427a718dc55072272eec
parent 52f25f7b30b684a46814cff60538e6a7636ed618
parent e6e216c48ea25bdbc2d0a262c74670fb6513e42b

Avoid ripple buffer creation for empty bounds automerge: b74155c
automerge: e6e216c

* commit 'e6e216c48ea25bdbc2d0a262c74670fb6513e42b':
  Avoid ripple buffer creation for empty bounds

graphics/java/android/graphics/drawable/RippleDrawable.java

diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java
index 9809606..1263447 100644
--- a/graphics/java/android/graphics/drawable/RippleDrawable.java
+++ b/graphics/java/android/graphics/drawable/RippleDrawable.java
@@ -661,7 +661,8 @@
 
         mHasValidMask = true;
 
-        if (maskType == MASK_NONE) {
+        final Rect bounds = getBounds();
+        if (maskType == MASK_NONE || bounds.isEmpty()) {
             if (mMaskBuffer != null) {
                 mMaskBuffer.recycle();
                 mMaskBuffer = null;
@@ -674,7 +675,6 @@
         }
 
         // Ensure we have a correctly-sized buffer.
-        final Rect bounds = getBounds();
         if (mMaskBuffer == null
                 || mMaskBuffer.getWidth() != bounds.width()
                 || mMaskBuffer.getHeight() != bounds.height()) {