commit b272ca83f0904ed7256de42e3ec8cfb7738a9372
author Adam Cohen <adamcohen@google.com> Sat Mar 28 22:12:01 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Mar 28 22:12:01 2015 +0000
tree 0708b4fade85280a6cb08ad5b7721af5acd3b128
parent 5f2a098ef3eecdc1af602582aaf8ff95b280ec28
parent b823ae4fca345e051831732ff2760023ef6ec2c4

am b823ae4f: Avoid casting AppWidgetProviderInfo to LauncherAppWidgetProviderInfo upon unparcel

* commit 'b823ae4fca345e051831732ff2760023ef6ec2c4':
  Avoid casting AppWidgetProviderInfo to LauncherAppWidgetProviderInfo upon unparcel

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 321b159..5be57f4 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1320,7 +1320,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;