Merge "Don't show empty widget in the case where a widget can't be inflated" into jb-mr1-dev

Author: Jim Miller

policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

@@ -667,8 +667,12 @@ private int getLayoutIdFor(SecurityMode securityMode) {
     private void addWidget(int appId) {
         AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(mContext);
         AppWidgetProviderInfo appWidgetInfo = appWidgetManager.getAppWidgetInfo(appId);
-        AppWidgetHostView view = getAppWidgetHost().createView(mContext, appId, appWidgetInfo);
-        addWidget(view);
+        if (appWidgetInfo != null) {
+            AppWidgetHostView view = getAppWidgetHost().createView(mContext, appId, appWidgetInfo);
+            addWidget(view);
+        } else {
+            Log.w(TAG, "AppWidgetInfo was null; not adding widget id " + appId);
+        }
     }
 
     private void maybePopulateWidgets() {