summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-01-16 16:14:29 -0800
committerSunny Goyal <sunnygoyal@google.com>2015-01-16 16:14:29 -0800
commite6b63a3d7335fed5b7bbcc6d2c6230ae28facd3e (patch)
treee6712c3bc79635f0ea17fe8544760fe5ede89808
parente87e6abc3639559f2746171999fee352cb5bd946 (diff)
downloadandroid_packages_apps_Trebuchet-e6b63a3d7335fed5b7bbcc6d2c6230ae28facd3e.tar.gz
android_packages_apps_Trebuchet-e6b63a3d7335fed5b7bbcc6d2c6230ae28facd3e.tar.bz2
android_packages_apps_Trebuchet-e6b63a3d7335fed5b7bbcc6d2c6230ae28facd3e.zip
Launcher crashes on widget bind permission prompt
Change-Id: If09feb357e1604e5ee1a66305b022674f466833e
-rw-r--r--src/com/android/launcher3/Launcher.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 0ceb862a7..f30867b9b 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -770,7 +770,7 @@ public class Launcher extends Activity
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;
@@ -2257,12 +2257,12 @@ public class Launcher extends Activity
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) {