commit 1025eeb175c5cc7902c4efbae1181f953f9ffc5d
author Adam Cohen <adamcohen@google.com> Thu Sep 18 00:46:46 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 18 00:46:46 2014 +0000
tree 168d85e9ba12f3122610dc1651a77acdf70ccaa5
parent 2e48757cc6dc5975c138672977a84ea36a8d32a7
parent 90f9f9577322205ff6f17bdc22fea9954b1ff783

am 90f9f957: am 83e5941d: Fix NPE in Workspace

* commit '90f9f9577322205ff6f17bdc22fea9954b1ff783':
  Fix NPE in Workspace

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);
                 }
             }