am 964e2a63: Merge "Fix NPE" into jb-mr1-dev

* commit '964e2a63c29ed81c2dbd82a3386fda2af7d4662c':
  Fix NPE

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;