commit b823ae4fca345e051831732ff2760023ef6ec2c4
author Adam Cohen <adamcohen@google.com> Fri Mar 27 18:07:52 2015 -0700
committer Adam Cohen <adamcohen@google.com> Fri Mar 27 18:09:01 2015 -0700
tree c88e9ef949e87157080efa8ee4731c5ee00d9856
parent 173f711e03dfce70d76c3b45f764a4f6b682a3b3

Avoid casting AppWidgetProviderInfo to LauncherAppWidgetProviderInfo upon unparcel

issue 19904413

Change-Id: Ie1b4a2b1331f6a707f8590cd0396138a20946658

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 56a74e5..cd2bc59 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1317,7 +1317,9 @@
             mPendingAddInfo.cellY = savedState.getInt(RUNTIME_STATE_PENDING_ADD_CELL_Y);
             mPendingAddInfo.spanX = savedState.getInt(RUNTIME_STATE_PENDING_ADD_SPAN_X);
             mPendingAddInfo.spanY = savedState.getInt(RUNTIME_STATE_PENDING_ADD_SPAN_Y);
-            mPendingAddWidgetInfo = savedState.getParcelable(RUNTIME_STATE_PENDING_ADD_WIDGET_INFO);
+            AppWidgetProviderInfo info = savedState.getParcelable(
+                    RUNTIME_STATE_PENDING_ADD_WIDGET_INFO);
+            mPendingAddWidgetInfo = LauncherAppWidgetProviderInfo.fromProviderInfo(this, info);
             mPendingAddWidgetId = savedState.getInt(RUNTIME_STATE_PENDING_ADD_WIDGET_ID);
             setWaitingForResult(true);
             mRestoring = true;