commit e1899e44368f7602afc5b87a75102e7ff551982c
author Sunny Goyal <sunnygoyal@google.com> Mon Sep 28 19:17:25 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 28 19:17:25 2015 +0000
tree 4bb9c56e0360c088625a6d049e2c65dc693ec23b
parent de9590be4ca2779ae0f7f64a48ac8b90472484f8
parent bf1a98f59692e3261a7474078594980ce0c0c35b

Merge "Adding size check when generating holographic outline" into ub-launcher3-burnaby

src/com/android/launcher3/HolographicOutlineHelper.java

diff --git a/src/com/android/launcher3/HolographicOutlineHelper.java b/src/com/android/launcher3/HolographicOutlineHelper.java
index 5ff85d6..0d68e33 100644
--- a/src/com/android/launcher3/HolographicOutlineHelper.java
+++ b/src/com/android/launcher3/HolographicOutlineHelper.java
@@ -164,6 +164,9 @@
 
         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);