diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-02-17 20:34:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-17 20:34:56 +0000 |
| commit | fce720f39adcf8a35b93978c36ab0e8833a74e3e (patch) | |
| tree | 18968a9d9ec6ec40d9cb12a85184070edfb8e4a7 /src | |
| parent | 80e6beb48ca71a321f667e79fe35a7ab2fb4c2bf (diff) | |
| parent | 2434d40ef271966096fea707ac4207d80d1b2901 (diff) | |
| download | android_packages_apps_Trebuchet-fce720f39adcf8a35b93978c36ab0e8833a74e3e.tar.gz android_packages_apps_Trebuchet-fce720f39adcf8a35b93978c36ab0e8833a74e3e.tar.bz2 android_packages_apps_Trebuchet-fce720f39adcf8a35b93978c36ab0e8833a74e3e.zip | |
Merge "Fixing crash when dragging and dropping a restored widget." into ub-launcher3-almonte
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/LauncherAppWidgetHostView.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/launcher3/LauncherAppWidgetHostView.java b/src/com/android/launcher3/LauncherAppWidgetHostView.java index 2d04df2de..954d2d711 100644 --- a/src/com/android/launcher3/LauncherAppWidgetHostView.java +++ b/src/com/android/launcher3/LauncherAppWidgetHostView.java @@ -145,9 +145,9 @@ public class LauncherAppWidgetHostView extends AppWidgetHostView implements Touc @Override public AppWidgetProviderInfo getAppWidgetInfo() { AppWidgetProviderInfo info = super.getAppWidgetInfo(); - if (!(info instanceof LauncherAppWidgetProviderInfo)) { + if (info != null && !(info instanceof LauncherAppWidgetProviderInfo)) { throw new IllegalStateException("Launcher widget must have" - + "LauncherAppWidgetProviderInfo"); + + " LauncherAppWidgetProviderInfo"); } return info; } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 402172717..6cfb6b29b 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -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(); |