summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-09-28 11:33:36 -0700
committerSunny Goyal <sunnygoyal@google.com>2015-09-28 11:34:23 -0700
commitbf1a98f59692e3261a7474078594980ce0c0c35b (patch)
tree4b2d4886aa4425bdabab68056c2112203b61e282
parent8ac727b2c6627028960a1efe18ab9c72442eef48 (diff)
downloadandroid_packages_apps_Trebuchet-bf1a98f59692e3261a7474078594980ce0c0c35b.tar.gz
android_packages_apps_Trebuchet-bf1a98f59692e3261a7474078594980ce0c0c35b.tar.bz2
android_packages_apps_Trebuchet-bf1a98f59692e3261a7474078594980ce0c0c35b.zip
Adding size check when generating holographic outline
Bug: 24426913 Change-Id: Ic7c9c767ea60ae4b25e064127105d94104233596
-rw-r--r--src/com/android/launcher3/HolographicOutlineHelper.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher3/HolographicOutlineHelper.java b/src/com/android/launcher3/HolographicOutlineHelper.java
index 5ff85d664..0d68e33b4 100644
--- a/src/com/android/launcher3/HolographicOutlineHelper.java
+++ b/src/com/android/launcher3/HolographicOutlineHelper.java
@@ -164,6 +164,9 @@ public class HolographicOutlineHelper {
int bitmapWidth = (int) (rect.width() * view.getScaleX());
int bitmapHeight = (int) (rect.height() * view.getScaleY());
+ if (bitmapHeight <= 0 || bitmapWidth <= 0) {
+ return null;
+ }
int key = (bitmapWidth << 16) | bitmapHeight;
Bitmap cache = mBitmapCache.get(key);