diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-09-18 00:40:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-18 00:40:38 +0000 |
| commit | 90f9f9577322205ff6f17bdc22fea9954b1ff783 (patch) | |
| tree | 168d85e9ba12f3122610dc1651a77acdf70ccaa5 | |
| parent | 3fcb2c75055ad423094c6bb1c980b34a3dfd5a69 (diff) | |
| parent | 83e5941d8ef6ca33bdd6278f6089c8d6d00de942 (diff) | |
| download | android_packages_apps_Trebuchet-90f9f9577322205ff6f17bdc22fea9954b1ff783.tar.gz android_packages_apps_Trebuchet-90f9f9577322205ff6f17bdc22fea9954b1ff783.tar.bz2 android_packages_apps_Trebuchet-90f9f9577322205ff6f17bdc22fea9954b1ff783.zip | |
am 83e5941d: Fix NPE in Workspace
* commit '83e5941d8ef6ca33bdd6278f6089c8d6d00de942':
Fix NPE in Workspace
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 909cf5f8c..051b0c085 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1107,7 +1107,7 @@ public class Workspace extends SmoothPagedView 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); } } |