diff options
| author | Danesh Mondegarian <daneshm90@gmail.com> | 2014-04-02 23:21:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-04-02 23:21:10 +0000 |
| commit | 3834572aa4e3aa546e79426fe63582b9d257856e (patch) | |
| tree | 8b2de596a26a1f6b0cc6a21b1fb62cdd3e5a2fc3 | |
| parent | 4f21e48d9fb936e97c263cf475b512e831094fff (diff) | |
| parent | 0f6b4eb9aef14224acea878799c7207b4e3aafed (diff) | |
| download | android_packages_apps_Trebuchet-3834572aa4e3aa546e79426fe63582b9d257856e.tar.gz android_packages_apps_Trebuchet-3834572aa4e3aa546e79426fe63582b9d257856e.tar.bz2 android_packages_apps_Trebuchet-3834572aa4e3aa546e79426fe63582b9d257856e.zip | |
Merge "Trebuchet : Check if target is null for cancelled events" into cm-11.0
| -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 c99a0a51a..43994d702 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -3960,7 +3960,7 @@ public class Workspace extends SmoothPagedView // be done post drop animation. stripEmptyScreens(); } - } else if (mDragInfo != null && (!(target instanceof InfoDropTarget))) { + } else if (mDragInfo != null && target != null && (!(target instanceof InfoDropTarget))) { CellLayout cellLayout; if (mLauncher.isHotseatLayout(target)) { cellLayout = mLauncher.getHotseat().getLayout(); |