From 558f1c2ac73c3a0c3c0c316222b6b7f9c76e2501 Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Wed, 9 Oct 2013 15:15:24 -0700 Subject: Fix NPE in CellLayout (issue 11113502) Change-Id: I8dafa79f68efdda5402e8b228ea3e81d77549a03 --- src/com/android/launcher3/CellLayout.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 07346f0cc..e3312d557 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -492,10 +492,12 @@ public class CellLayout extends ViewGroup { 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; -- cgit v1.2.3