commit 90f9f9577322205ff6f17bdc22fea9954b1ff783
author Adam Cohen <adamcohen@google.com> Thu Sep 18 00:40:38 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 18 00:40:38 2014 +0000
tree 168d85e9ba12f3122610dc1651a77acdf70ccaa5
parent 3fcb2c75055ad423094c6bb1c980b34a3dfd5a69
parent 83e5941d8ef6ca33bdd6278f6089c8d6d00de942

am 83e5941d: Fix NPE in Workspace

* commit '83e5941d8ef6ca33bdd6278f6089c8d6d00de942':
  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);
                 }
             }