commit 83e5941d8ef6ca33bdd6278f6089c8d6d00de942
author Adam Cohen <adamcohen@google.com> Wed Sep 17 16:46:55 2014 -0700
committer Adam Cohen <adamcohen@google.com> Wed Sep 17 16:47:08 2014 -0700
tree 168d85e9ba12f3122610dc1651a77acdf70ccaa5
parent 136882c1950da1e5f0a24a8b6807b186a3297d8e

Fix NPE in Workspace

Bug: 17503479
Change-Id: Ib20dfd67c5a755cd4b684163bb538a1bf77fa6ca

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 909cf5f..051b0c0 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1107,7 +1107,7 @@
         case MotionEvent.ACTION_UP:
             if (mTouchState == TOUCH_STATE_REST) {
                 final CellLayout currentPage = (CellLayout) getChildAt(mCurrentPage);
-                if (!currentPage.lastDownOnOccupiedCell()) {
+                if (currentPage != null && !currentPage.lastDownOnOccupiedCell()) {
                     onWallpaperTap(ev);
                 }
             }