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

* commit '964e2a63c29ed81c2dbd82a3386fda2af7d4662c':
  Fix NPE
This commit is contained in:
Michael Jurka authored and Android Git Automerger committed 2012-10-19 09:08:58 -07:00
commit d5bc834f41
1 file changed
+3
+3
View File
@@ -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;