From 023c71eb3b2bbe63272cb74baaf050c4188c89b0 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Fri, 19 Oct 2012 17:32:24 +0200
Subject: [PATCH] Fix NPE

Bug: 7356682
Change-Id: Ic6522da1ec6ac0d57f1565cef9c43949f2d7fd70
---
 src/com/android/launcher2/DragLayer.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java
index fed0ad9e4f..e870d0aa11 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;