commit 8f9a787945c3326791c61b001e786b96e9fc4341
author Sunny Goyal <sunnygoyal@google.com> Fri Jan 16 16:14:29 2015 -0800
committer Adam Cohen <adamcohen@google.com> Fri Feb 06 23:38:45 2015 +0000
tree e08e02b708e08247edbf07a48f0c852cf9de6720
parent bd4a78937ffe2f37386dae4ae8817e33422c1267

Launcher crashes on widget bind permission prompt

Change-Id: If09feb357e1604e5ee1a66305b022674f466833e
(cherry picked from commit e6b63a3d7335fed5b7bbcc6d2c6230ae28facd3e)

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5d8e136..84476b7 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -757,7 +757,7 @@
                 mWorkspace.removeExtraEmptyScreenDelayed(true, exitSpringLoaded,
                         ON_ACTIVITY_RESULT_ANIMATION_DELAY, false);
             } else if (resultCode == RESULT_OK) {
-                addAppWidgetImpl(appWidgetId, (PendingAddWidgetInfo) mPendingAddInfo, null,
+                addAppWidgetImpl(appWidgetId, mPendingAddInfo, null,
                         mPendingAddWidgetInfo, ON_ACTIVITY_RESULT_ANIMATION_DELAY);
             }
             return;
@@ -2243,12 +2243,12 @@
         mPendingAddInfo.dropPos = null;
     }
 
-    void addAppWidgetImpl(final int appWidgetId, final PendingAddWidgetInfo info, final
+    void addAppWidgetImpl(final int appWidgetId, final ItemInfo info, final
             AppWidgetHostView boundWidget, final LauncherAppWidgetProviderInfo appWidgetInfo) {
         addAppWidgetImpl(appWidgetId, info, boundWidget, appWidgetInfo, 0);
     }
 
-    void addAppWidgetImpl(final int appWidgetId, final PendingAddWidgetInfo info,
+    void addAppWidgetImpl(final int appWidgetId, final ItemInfo info,
             final AppWidgetHostView boundWidget, final LauncherAppWidgetProviderInfo appWidgetInfo,
             int delay) {
         if (appWidgetInfo.configure != null) {