summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/Workspace.java
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2012-04-02 16:53:26 -0700
committerAdam Cohen <adamcohen@google.com>2012-04-02 16:53:26 -0700
commitc0a5df9c650b22f8ea06a0298f00bbfab40e5844 (patch)
tree073b3a0d30c6fb21400eb4958e90ab647306e40a /src/com/android/launcher2/Workspace.java
parent3535bde122583d054634914022f8d0b953405596 (diff)
downloadandroid_packages_apps_Trebuchet-c0a5df9c650b22f8ea06a0298f00bbfab40e5844.tar.gz
android_packages_apps_Trebuchet-c0a5df9c650b22f8ea06a0298f00bbfab40e5844.tar.bz2
android_packages_apps_Trebuchet-c0a5df9c650b22f8ea06a0298f00bbfab40e5844.zip
Fix NPE when dragging Problem Loading Widget (issue 5899606)
Change-Id: I63656a2bb47a4af041f161e1f15095c89ab006b0
Diffstat (limited to 'src/com/android/launcher2/Workspace.java')
-rw-r--r--src/com/android/launcher2/Workspace.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 06e0185c5..91f1d3ec6 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -2295,7 +2295,8 @@ public class Workspace extends SmoothPagedView
final LauncherAppWidgetHostView hostView = (LauncherAppWidgetHostView) cell;
AppWidgetProviderInfo pinfo = hostView.getAppWidgetInfo();
- if (pinfo.resizeMode != AppWidgetProviderInfo.RESIZE_NONE) {
+ if (pinfo != null &&
+ pinfo.resizeMode != AppWidgetProviderInfo.RESIZE_NONE) {
final Runnable addResizeFrame = new Runnable() {
public void run() {
DragLayer dragLayer = mLauncher.getDragLayer();