summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2015-03-28 22:12:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-28 22:12:01 +0000
commitb272ca83f0904ed7256de42e3ec8cfb7738a9372 (patch)
tree0708b4fade85280a6cb08ad5b7721af5acd3b128
parent5f2a098ef3eecdc1af602582aaf8ff95b280ec28 (diff)
parentb823ae4fca345e051831732ff2760023ef6ec2c4 (diff)
downloadandroid_packages_apps_Trebuchet-b272ca83f0904ed7256de42e3ec8cfb7738a9372.tar.gz
android_packages_apps_Trebuchet-b272ca83f0904ed7256de42e3ec8cfb7738a9372.tar.bz2
android_packages_apps_Trebuchet-b272ca83f0904ed7256de42e3ec8cfb7738a9372.zip
am b823ae4f: Avoid casting AppWidgetProviderInfo to LauncherAppWidgetProviderInfo upon unparcel
* commit 'b823ae4fca345e051831732ff2760023ef6ec2c4': Avoid casting AppWidgetProviderInfo to LauncherAppWidgetProviderInfo upon unparcel
-rw-r--r--src/com/android/launcher3/Launcher.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 321b15919..5be57f444 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1320,7 +1320,9 @@ public class Launcher extends Activity
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;