Merge "Fixing crash when dragging and dropping a restored widget." into ub-launcher3-almonte

2015-02-17 20:34:55 +00:00
parent 80e6beb48c 2434d40ef2
commit fce720f39a
2 changed files with 4 additions and 5 deletions
@@ -3177,9 +3177,8 @@ public class Workspace extends SmoothPagedView
                        // in its final location

                        final LauncherAppWidgetHostView hostView = (LauncherAppWidgetHostView) cell;
-                        LauncherAppWidgetProviderInfo pInfo = (LauncherAppWidgetProviderInfo)
-                                hostView.getAppWidgetInfo();
-                        if (pInfo.resizeMode != AppWidgetProviderInfo.RESIZE_NONE) {
+                        AppWidgetProviderInfo pInfo = hostView.getAppWidgetInfo();
+                        if (pInfo != null && pInfo.resizeMode != AppWidgetProviderInfo.RESIZE_NONE) {
                            final Runnable addResizeFrame = new Runnable() {
                                public void run() {
                                    DragLayer dragLayer = mLauncher.getDragLayer();