From b74155cf01f959fc9b7909de5a22806ad519f7c9 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Wed, 21 Jan 2015 12:30:49 -0800
Subject: [PATCH] Avoid ripple buffer creation for empty bounds

Bug: 19068439
Change-Id: I031d4303bbf101a25612dce6f02d81ce4cf58e2b
---
 graphics/java/android/graphics/drawable/RippleDrawable.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java
index 98096069419da..126344734301f 100644
--- a/graphics/java/android/graphics/drawable/RippleDrawable.java
+++ b/graphics/java/android/graphics/drawable/RippleDrawable.java
@@ -661,7 +661,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;
@@ -674,7 +675,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()) {