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

* commit 'd5bc834f413d08c6c9db89b0d27e636361661d51': Fix NPE
2012-10-19 09:11:18 -07:00
parent 9160410e40 d5bc834f41
commit 05565f5f01
1 changed files with 3 additions and 0 deletions
@@ -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;