From 4de0974c460ce6439cce7931fb0ba945095a4b94 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Thu, 12 Dec 2013 16:16:39 -0800
Subject: Fix NPE from feedback (issue 12106858)

Change-Id: I63f7f73b85d4c1652d1e722f94c51b567a83cc6b
---
 src/com/android/launcher3/Workspace.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/com/android/launcher3/Workspace.java')

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 72399e4ec..52420b73b 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1666,7 +1666,7 @@ public class Workspace extends SmoothPagedView
                 cl.setOverscrollTransformsDirty(true);
             }
         } else {
-            if (mOverscrollTransformsSet) {
+            if (mOverscrollTransformsSet && getChildCount() > 0) {
                 mOverscrollTransformsSet = false;
                 ((CellLayout) getChildAt(0)).resetOverscrollTransforms();
                 ((CellLayout) getChildAt(getChildCount() - 1)).resetOverscrollTransforms();
-- 
cgit v1.2.3