From 0913896b98b893abffa93d0594c3bb07bbc02c11 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Sun, 11 Sep 2011 17:48:57 -0700
Subject: Fixing NPE in LauncherAppWidgetHostView, issue 5270711

Change-Id: Iefe70bc362e2a6540b497412f349e15d9a3120cb
---
 src/com/android/launcher2/LauncherAppWidgetHostView.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.3