summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmerson Pinter <dev@pinter.com.br>2012-08-31 20:59:15 -0300
committerEmerson Pinter <dev@pinter.com.br>2012-08-31 23:31:59 -0300
commitab310e59ef0342b0a1e24e28ff13b2e00370ffa0 (patch)
tree1a012963b4a1cb8aab6f662b39af1301b2b9d82b /src
parentb3b01aa139c0da092fd272fa898e482b8bd98c74 (diff)
downloadandroid_packages_apps_Trebuchet-ab310e59ef0342b0a1e24e28ff13b2e00370ffa0.tar.gz
android_packages_apps_Trebuchet-ab310e59ef0342b0a1e24e28ff13b2e00370ffa0.tar.bz2
android_packages_apps_Trebuchet-ab310e59ef0342b0a1e24e28ff13b2e00370ffa0.zip
Trebuchet: Fix NPE when rotating
Without this, after change workspace, move an icon and then rotate, Trebuchet crashes with NPE. Change-Id: I9f7e089462590b1c29547cbe2e0775200c85d70f
Diffstat (limited to 'src')
-rw-r--r--src/com/cyanogenmod/trebuchet/DragLayer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/cyanogenmod/trebuchet/DragLayer.java b/src/com/cyanogenmod/trebuchet/DragLayer.java
index 76b74e9c5..d15defd67 100644
--- a/src/com/cyanogenmod/trebuchet/DragLayer.java
+++ b/src/com/cyanogenmod/trebuchet/DragLayer.java
@@ -169,8 +169,8 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
@Override
public boolean onInterceptHoverEvent(MotionEvent ev) {
- Folder currentFolder = mLauncher.getWorkspace().getOpenFolder();
- if (currentFolder == null) {
+ Folder currentFolder;
+ if (mLauncher.getWorkspace()==null || (currentFolder = mLauncher.getWorkspace().getOpenFolder())==null) {
return false;
} else {
AccessibilityManager accessibilityManager = (AccessibilityManager)