summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-04-23 10:33:47 -0700
committerAlan Viverette <alanv@google.com>2014-04-23 10:33:47 -0700
commit40619ae8016248979c0147f6bcc9bfd41f07bb4a (patch)
tree1f1ab5eca5d4188908098e6886f0a9b66d21a9da /graphics
parent70ad9bc03341cc0a5b8d6c9c1f43afac6bcc9c62 (diff)
downloadframeworks_base-40619ae8016248979c0147f6bcc9bfd41f07bb4a.zip
frameworks_base-40619ae8016248979c0147f6bcc9bfd41f07bb4a.tar.gz
frameworks_base-40619ae8016248979c0147f6bcc9bfd41f07bb4a.tar.bz2
Prevent new ripples when max reached
BUG: 14270202 Change-Id: I53b0522a175eca043ba1cf007377312d03fd8f6d
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java b/graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java
index 5c370a4..5101e35 100644
--- a/graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java
+++ b/graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java
@@ -313,6 +313,7 @@ public class TouchFeedbackDrawable extends LayerDrawable {
if (mActiveRipplesCount >= MAX_RIPPLES) {
Log.e(LOG_TAG, "Max ripple count exceeded", new RuntimeException());
+ return;
}
final Ripple ripple = mTouchedRipples.get(id);