commit d5bc834f413d08c6c9db89b0d27e636361661d51
author Michael Jurka <mikejurka@google.com> Fri Oct 19 09:08:58 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 19 09:08:58 2012 -0700
tree de87ddce603863bda5d425d219a6f6dda30a9f03
parent eb91462f087028e2ce22552ba8ce4e17b9a4f9c1
parent 964e2a63c29ed81c2dbd82a3386fda2af7d4662c

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

* commit '964e2a63c29ed81c2dbd82a3386fda2af7d4662c':
  Fix NPE

src/com/android/launcher2/DragLayer.java

diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java
index fed0ad9..e870d0a 100644
--- a/src/com/android/launcher2/DragLayer.java
+++ b/src/com/android/launcher2/DragLayer.java
@@ -167,6 +167,9 @@
 
     @Override
     public boolean onInterceptHoverEvent(MotionEvent ev) {
+        if (mLauncher == null || mLauncher.getWorkspace() == null) {
+            return false;
+        }
         Folder currentFolder = mLauncher.getWorkspace().getOpenFolder();
         if (currentFolder == null) {
             return false;