commit 05565f5f01d062672dc27ffce5a2f85227c4bfaf
author Michael Jurka <mikejurka@google.com> Fri Oct 19 09:11:18 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 19 09:11:18 2012 -0700
tree de87ddce603863bda5d425d219a6f6dda30a9f03
parent 9160410e40c8e060a7012a35b38f2532fa159084
parent d5bc834f413d08c6c9db89b0d27e636361661d51

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

* commit 'd5bc834f413d08c6c9db89b0d27e636361661d51':
  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;