diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-09-17 16:46:55 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2014-09-17 16:47:08 -0700 |
| commit | 83e5941d8ef6ca33bdd6278f6089c8d6d00de942 (patch) | |
| tree | 168d85e9ba12f3122610dc1651a77acdf70ccaa5 | |
| parent | 136882c1950da1e5f0a24a8b6807b186a3297d8e (diff) | |
| download | android_packages_apps_Trebuchet-83e5941d8ef6ca33bdd6278f6089c8d6d00de942.tar.gz android_packages_apps_Trebuchet-83e5941d8ef6ca33bdd6278f6089c8d6d00de942.tar.bz2 android_packages_apps_Trebuchet-83e5941d8ef6ca33bdd6278f6089c8d6d00de942.zip | |
Fix NPE in Workspace
Bug: 17503479
Change-Id: Ib20dfd67c5a755cd4b684163bb538a1bf77fa6ca
| -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); } } |