diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-10-19 09:07:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-19 09:07:02 -0700 |
| commit | 964e2a63c29ed81c2dbd82a3386fda2af7d4662c (patch) | |
| tree | de87ddce603863bda5d425d219a6f6dda30a9f03 /src/com/android | |
| parent | d6dd7c8a21e416d7c118517569a242ac7de6c696 (diff) | |
| parent | 023c71eb3b2bbe63272cb74baaf050c4188c89b0 (diff) | |
| download | packages_apps_trebuchet-964e2a63c29ed81c2dbd82a3386fda2af7d4662c.zip packages_apps_trebuchet-964e2a63c29ed81c2dbd82a3386fda2af7d4662c.tar.gz packages_apps_trebuchet-964e2a63c29ed81c2dbd82a3386fda2af7d4662c.tar.bz2 | |
Merge "Fix NPE" into jb-mr1-dev
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher2/DragLayer.java | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ 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; |