commit 558f1c2ac73c3a0c3c0c316222b6b7f9c76e2501
author Adam Cohen <adamcohen@google.com> Wed Oct 09 15:15:24 2013 -0700
committer Adam Cohen <adamcohen@google.com> Wed Oct 09 15:21:36 2013 -0700
tree 3989e5488a6bda0595a096307754d1577ed02de2
parent 564a2e7116b026c1d73829e65d47b660b03a3c72

Fix NPE in CellLayout (issue 11113502)

Change-Id: I8dafa79f68efdda5402e8b228ea3e81d77549a03

src/com/android/launcher3/CellLayout.java

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 07346f0..e3312d5 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -492,10 +492,12 @@
             int width, height;
             cellToPoint(fra.mCellX, fra.mCellY, mTempLocation);
             View child = getChildAt(fra.mCellX, fra.mCellY);
-            int centerX = mTempLocation[0] + mCellWidth / 2;
-            int centerY = mTempLocation[1] + previewOffset / 2 +
-                    child.getPaddingTop() + grid.folderBackgroundOffset;
+
             if (child != null) {
+                int centerX = mTempLocation[0] + mCellWidth / 2;
+                int centerY = mTempLocation[1] + previewOffset / 2 +
+                        child.getPaddingTop() + grid.folderBackgroundOffset;
+
                 // Draw outer ring, if it exists
                 if (FolderIcon.HAS_OUTER_RING) {
                     d = FolderRingAnimator.sSharedOuterRingDrawable;