commit 8ac90a0609caba703b22dc4462da4f45fbb1985e
author Alan Viverette <alanv@google.com> Wed Jan 21 21:13:33 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 21 21:13:33 2015 +0000
tree 6453cdc96b616c00771ea9e2fcb24a65ed30b2fb
parent 767cddd3ddbe9ac2f82e3213338fcbd61d3d85c5
parent 2aacb861f4c7b80c5d2bb22956c9a5d4ace4df67

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

* commit '2aacb861f4c7b80c5d2bb22956c9a5d4ace4df67':
  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 c7b506e..ca9f714 100644
--- a/graphics/java/android/graphics/drawable/RippleDrawable.java
+++ b/graphics/java/android/graphics/drawable/RippleDrawable.java
@@ -673,7 +673,8 @@
 
         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 @@
         }
 
         // Ensure we have a correctly-sized buffer.
-        final Rect bounds = getBounds();
         if (mMaskBuffer == null
                 || mMaskBuffer.getWidth() != bounds.width()
                 || mMaskBuffer.getHeight() != bounds.height()) {