diff options
| author | Michael Jurka <mikejurka@google.com> | 2011-09-12 11:45:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-12 11:45:51 -0700 |
| commit | d88a0e64ac80197a73fa48aa16c24245e9314020 (patch) | |
| tree | 279b5af3f1964e847db674353331cef84a7aaaba /src | |
| parent | 6027705e8c4713daabe63d049d71f9acdf972244 (diff) | |
| parent | 0913896b98b893abffa93d0594c3bb07bbc02c11 (diff) | |
| download | android_packages_apps_Trebuchet-d88a0e64ac80197a73fa48aa16c24245e9314020.tar.gz android_packages_apps_Trebuchet-d88a0e64ac80197a73fa48aa16c24245e9314020.tar.bz2 android_packages_apps_Trebuchet-d88a0e64ac80197a73fa48aa16c24245e9314020.zip | |
Merge "Fixing NPE in LauncherAppWidgetHostView, issue 5270711"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/LauncherAppWidgetHostView.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/launcher2/LauncherAppWidgetHostView.java b/src/com/android/launcher2/LauncherAppWidgetHostView.java index 7118c49fc..791711893 100644 --- a/src/com/android/launcher2/LauncherAppWidgetHostView.java +++ b/src/com/android/launcher2/LauncherAppWidgetHostView.java @@ -118,9 +118,13 @@ public class LauncherAppWidgetHostView extends AppWidgetHostView { @Override public void setAppWidget(int appWidgetId, AppWidgetProviderInfo info) { super.setAppWidget(appWidgetId, info); - // We add necessary padding to the AppWidgetHostView - Launcher.Padding padding = mLauncher.getPaddingForWidget(info.provider); - setPadding(padding.left, padding.top, padding.right, padding.bottom); + // Sometimes the AppWidgetManager returns a null AppWidgetProviderInfo object for + // a widget, eg. for some widgets in safe mode. + if (info != null) { + // We add necessary padding to the AppWidgetHostView + Launcher.Padding padding = mLauncher.getPaddingForWidget(info.provider); + setPadding(padding.left, padding.top, padding.right, padding.bottom); + } } @Override |