summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-10-19 17:32:24 +0200
committerMichael Jurka <mikejurka@google.com>2012-10-19 17:32:24 +0200
commit023c71eb3b2bbe63272cb74baaf050c4188c89b0 (patch)
tree2055fcab5e7bb9c8d44fc2525352083bd0a02f00
parent4cd7f281056740cc22eccd156c34b98b5816d370 (diff)
downloadandroid_packages_apps_Trebuchet-023c71eb3b2bbe63272cb74baaf050c4188c89b0.tar.gz
android_packages_apps_Trebuchet-023c71eb3b2bbe63272cb74baaf050c4188c89b0.tar.bz2
android_packages_apps_Trebuchet-023c71eb3b2bbe63272cb74baaf050c4188c89b0.zip
Fix NPE
Bug: 7356682 Change-Id: Ic6522da1ec6ac0d57f1565cef9c43949f2d7fd70
-rw-r--r--src/com/android/launcher2/DragLayer.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java
index fed0ad9e4..e870d0aa1 100644
--- a/src/com/android/launcher2/DragLayer.java
+++ b/src/com/android/launcher2/DragLayer.java
@@ -167,6 +167,9 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
@Override
public boolean onInterceptHoverEvent(MotionEvent ev) {
+ if (mLauncher == null || mLauncher.getWorkspace() == null) {
+ return false;
+ }
Folder currentFolder = mLauncher.getWorkspace().getOpenFolder();
if (currentFolder == null) {
return false;